[neon/forks/base-files/Neon/stable] /: Revert "rebase on 24.02.2"
Carlos De Maine
null at kde.org
Tue Feb 18 23:54:14 GMT 2025
Git commit 83f57f7bc99f755da3ce2a49b4ece5394d8005c6 by Carlos De Maine.
Committed on 18/02/2025 at 23:54.
Pushed by carlosdem into branch 'Neon/stable'.
Revert "rebase on 24.02.2"
This reverts commit cd615201ab6db1e2abcf353978fff40623b39777.
M +2 -1 debian/README
M +1 -1 debian/base-files.dirs
M +1 -0 debian/changelog
M +1 -1 debian/check-md5sum-etc
D +0 -10 debian/conffiles
M +1 -1 debian/control
M +1 -1 debian/postinst.in
M +1 -1 debian/rules
M +1 -1 etc/debian_version
M +1 -0 etc/issue
M +1 -1 etc/issue.net
M +1 -0 etc/legal
M +1 -1 etc/lsb-release
M +1 -1 etc/os-release
M +1 -1 motd/10-help-text
M +1 -1 share/dot.profile
D +0 -20 share/nsswitch.conf
D +0 -5 share/nsswitch.conf.md5sums
M +1 -1 share/profile.md5sums
https://invent.kde.org/neon/forks/base-files/-/commit/83f57f7bc99f755da3ce2a49b4ece5394d8005c6
diff --git a/debian/README b/debian/README
index e8adbfe..9ced2ea 100644
--- a/debian/README
+++ b/debian/README
@@ -1,4 +1,5 @@
Frequently Asked Questions about base-files
+===========================================
* Questions about /etc/issue and /etc/debian_version:
@@ -95,4 +96,4 @@ when base-files is upgraded. Therefore, if you are running any sort of
compliance tests, you should do it on newly installed systems only.
-Santiago Vila <sanvila at debian.org>
\ No newline at end of file
+Santiago Vila <sanvila at debian.org>
diff --git a/debian/base-files.dirs b/debian/base-files.dirs
index 730b09d..7d4741d 100644
--- a/debian/base-files.dirs
+++ b/debian/base-files.dirs
@@ -36,4 +36,4 @@ var/lock
var/log
var/run
var/spool
-var/tmp
\ No newline at end of file
+var/tmp
diff --git a/debian/changelog b/debian/changelog
index b53747e..52863d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3418,3 +3418,4 @@ base-files (1.2.0-1) unstable; urgency=low
/etc/passwd and /etc/group are installed by the "base-passwd" package.
-- Bruce Perens <bruce at pixar.com> Thu, 14 Nov 1996 21:02:09 -0800
+
diff --git a/debian/check-md5sum-etc b/debian/check-md5sum-etc
index 26b2061..bd9380b 100644
--- a/debian/check-md5sum-etc
+++ b/debian/check-md5sum-etc
@@ -5,4 +5,4 @@ if ! grep -q "$md5" share/${file}.md5sums; then
echo Error: share/${file}.md5sums is incomplete.
echo Need to add "$md5" with current version.
exit 1
-fi
\ No newline at end of file
+fi
diff --git a/debian/conffiles b/debian/conffiles
deleted file mode 100644
index 92511da..0000000
--- a/debian/conffiles
+++ /dev/null
@@ -1,10 +0,0 @@
-/etc/debian_version
-/etc/dpkg/origins/debian
-/etc/dpkg/origins/ubuntu
-/etc/host.conf
-/etc/issue
-/etc/issue.net
-/etc/legal
-/etc/lsb-release
-/etc/update-motd.d/00-header
-/etc/update-motd.d/10-help-text
diff --git a/debian/control b/debian/control
index a07c275..e7e945a 100644
--- a/debian/control
+++ b/debian/control
@@ -34,4 +34,4 @@ Description: Configuration for motd-news shipped in base-files
This package contains the configuration read by the motd-news script
shipped in the base-files package.
.
- Install this package if you want motd-news to be enabled.
\ No newline at end of file
+ Install this package if you want motd-news to be enabled.
diff --git a/debian/postinst.in b/debian/postinst.in
index 62c14c1..9020fd6 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -140,4 +140,4 @@ if [ "$2" != "" ] && \
fi
fi
-#DEBHELPER#
\ No newline at end of file
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 96b8395..df702fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,4 +85,4 @@ override_dh_fixperms:
cd debian/base-files && chmod 755 `find . -type d`
cd debian/base-files && chmod 1777 `cat ../1777-dirs`
cd debian/base-files && chmod 2775 `cat ../2775-dirs`
- cd debian/base-files && chmod 700 root
\ No newline at end of file
+ cd debian/base-files && chmod 700 root
diff --git a/etc/debian_version b/etc/debian_version
index b220468..201ac20 100644
--- a/etc/debian_version
+++ b/etc/debian_version
@@ -1 +1 @@
-trixie/sid
\ No newline at end of file
+trixie/sid
diff --git a/etc/issue b/etc/issue
index 9db81fc..a64a580 100644
--- a/etc/issue
+++ b/etc/issue
@@ -1 +1,2 @@
KDE neon Testing Edition \n \l
+
diff --git a/etc/issue.net b/etc/issue.net
index 3277a57..9db81fc 100644
--- a/etc/issue.net
+++ b/etc/issue.net
@@ -1 +1 @@
-KDE neon Testing Edition \n \l
\ No newline at end of file
+KDE neon Testing Edition \n \l
diff --git a/etc/legal b/etc/legal
index 1d9f0ca..6f96b16 100644
--- a/etc/legal
+++ b/etc/legal
@@ -5,3 +5,4 @@ individual files in /usr/share/doc/*/copyright.
KDE neon comes with ABSOLUTELY NO WARRANTY, to the extent permitted by
applicable law.
+
diff --git a/etc/lsb-release b/etc/lsb-release
index 74186e1..70c230d 100644
--- a/etc/lsb-release
+++ b/etc/lsb-release
@@ -1,4 +1,4 @@
DISTRIB_ID=neon
DISTRIB_RELEASE=24.04
DISTRIB_CODENAME=noble
-DISTRIB_DESCRIPTION="KDE neon Testing Edition"
\ No newline at end of file
+DISTRIB_DESCRIPTION="KDE neon Testing Edition"
diff --git a/etc/os-release b/etc/os-release
index 7d71a10..7f9c93c 100644
--- a/etc/os-release
+++ b/etc/os-release
@@ -10,4 +10,4 @@ SUPPORT_URL="https://neon.kde.org/"
BUG_REPORT_URL="https://bugs.kde.org/"
PRIVACY_POLICY_URL="https://kde.org/privacypolicy/"
UBUNTU_CODENAME=noble
-LOGO=start-here-kde-neon
\ No newline at end of file
+LOGO=start-here-kde-neon
diff --git a/motd/10-help-text b/motd/10-help-text
index 0626848..1f08cd0 100644
--- a/motd/10-help-text
+++ b/motd/10-help-text
@@ -25,4 +25,4 @@ return # neon addition, disable ubuntu references, they feel awkwardly out of pl
printf "\n"
printf " * Documentation: https://help.ubuntu.com\n"
printf " * Management: https://landscape.canonical.com\n"
-printf " * Support: https://ubuntu.com/pro\n"
\ No newline at end of file
+printf " * Support: https://ubuntu.com/pro\n"
diff --git a/share/dot.profile b/share/dot.profile
index db35d7d..c4c7402 100644
--- a/share/dot.profile
+++ b/share/dot.profile
@@ -6,4 +6,4 @@ if [ "$BASH" ]; then
fi
fi
-mesg n 2> /dev/null || true
\ No newline at end of file
+mesg n 2> /dev/null || true
diff --git a/share/nsswitch.conf b/share/nsswitch.conf
deleted file mode 100644
index 1142be1..0000000
--- a/share/nsswitch.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# /etc/nsswitch.conf
-#
-# Example configuration of GNU Name Service Switch functionality.
-# If you have the `glibc-doc-reference' and `info' packages installed, try:
-# `info libc "Name Service Switch"' for information about this file.
-
-passwd: compat
-group: compat
-shadow: compat
-gshadow: files
-
-hosts: files dns
-networks: files
-
-protocols: db files
-services: db files
-ethers: db files
-rpc: db files
-
-netgroup: nis
diff --git a/share/nsswitch.conf.md5sums b/share/nsswitch.conf.md5sums
deleted file mode 100644
index a2f3850..0000000
--- a/share/nsswitch.conf.md5sums
+++ /dev/null
@@ -1,5 +0,0 @@
-109e33e2c91d1853b5bc56078a96aa18 3.0.0 to 3.1.15
-3114ea9cf2f3bd8d120b4da96e3832d5 3.1.8 and 3.1.9
-295c15c4bdac80e50b37689ef08f359c 3.1.16 to 7.2
-30b82cb1ce20d480703da2208a4607b4 6.6
-f8e97bf611374634c7cb3a6085503ab5 7.3
diff --git a/share/profile.md5sums b/share/profile.md5sums
index 16e980c..3da8ac8 100644
--- a/share/profile.md5sums
+++ b/share/profile.md5sums
@@ -9,4 +9,4 @@ b59ea6ac3a1ad8c0527ec94f73bafca0
c3a1d42cddcc565f16b48eb9c2119d9d
85a2a7227b884e4c84ff950626fcc89f
9d5ee34149287021622dd9e21c17ec26
-9926b56bc6e576d4ad206dd82d38deff
\ No newline at end of file
+9926b56bc6e576d4ad206dd82d38deff
More information about the Neon-commits
mailing list