summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-01-14 06:22:51 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-07-17 20:20:25 +0000
commit56773577bbbc3c9e3a6b37317a65c4fb2a4648c1 (patch)
tree768b7cdc0f930a96b607ac85158c33d36417fa13
parentMerging upstream version 10.1. (diff)
downloadbase-files-56773577bbbc3c9e3a6b37317a65c4fb2a4648c1.zip
base-files-56773577bbbc3c9e3a6b37317a65c4fb2a4648c1.tar.xz
Merging debian version 10.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog16
-rw-r--r--debian/control2
-rw-r--r--debian/postinst.in7
-rwxr-xr-xdebian/rules32
4 files changed, 32 insertions, 25 deletions
diff --git a/debian/changelog b/debian/changelog
index 3bd6150..4833311 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+base-files (10.1) unstable; urgency=medium
+
+ * Add CC0-1.0 to common-licenses. Closes: #859649, #882628.
+ Source: https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt.
+ * Simplify debian/rules a little bit by dropping install target
+ and using override_dh_auto_install instead. Closes: #886901.
+ Package should now build from source again in every supported way.
+ Thanks to Daniel Schepler for the report and to Niels Thykier for
+ clarifying the true nature of this bug.
+ * Do not create /etc/staff-group-for-usr-local on new installs anymore.
+ Do not create it on upgrades either, as we don't support upgrades
+ skipping stable releases, and even less skipping several releases.
+ * Standards-Version: 4.1.3.
+
+ -- Santiago Vila <sanvila@debian.org> Sun, 14 Jan 2018 00:36:34 +0100
+
base-files (10-0+dschinn4) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/control b/debian/control
index c56a59a..bb94f19 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
XSBC-Original-Maintainer: Santiago Vila <sanvila@debian.org>
Bugs: mailto:maintainers@lists.progress-linux.org
-Standards-Version: 3.9.8
+Standards-Version: 4.1.3
Build-Depends: debhelper (>= 9)
Vcs-Browser: https://sources.progress-linux.org/distributions/dschinn-backports/packages/base-files
Vcs-Git: https://sources.progress-linux.org/distributions/dschinn-backports/packages/base-files
diff --git a/debian/postinst.in b/debian/postinst.in
index 5c1824f..1d35ee1 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -51,8 +51,6 @@ if [ ! -e /etc/dpkg/origins/default ]; then
fi
if [ "$1" = "configure" ] && [ "$2" = "" ]; then
- install_from_default staff-group-for-usr-local \
- /etc/staff-group-for-usr-local
install_from_default dot.profile /root/.profile
install_from_default dot.bashrc /root/.bashrc
install_from_default profile /etc/profile
@@ -122,8 +120,3 @@ if [ "$1" = "configure" ] && [ "$2" != "" ]; then
install_directory mnt 755 root
fi
fi
-
-if dpkg --compare-versions "$2" lt-nl "6.10"; then
- install_from_default staff-group-for-usr-local \
- /etc/staff-group-for-usr-local
-fi
diff --git a/debian/rules b/debian/rules
index c596d68..0783311 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ ifeq ($(DEB_HOST_GNU_SYSTEM),gnu)
endif
VENDORFILE = progress-linux
+DESTDIR = debian/base-files
%:
dh $@
@@ -19,23 +20,6 @@ override_dh_auto_build:
sed -e "s/#VENDORFILE#/$(VENDORFILE)/g" debian/postinst.in > debian/postinst
override_dh_auto_install:
- debian/rules install DESTDIR=`pwd`/debian/base-files
-
-override_dh_link:
- dh_link -X os-release
-
-override_dh_compress:
- dh_compress -X README
-
-override_dh_fixperms:
- dh_fixperms
- cd debian/base-files && chown root:staff var/local
- 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
-
-install:
install -p -m 644 etc/* $(DESTDIR)/etc
install -p -m 755 motd/* $(DESTDIR)/etc/update-motd.d
install -p -m 644 licenses/* $(DESTDIR)/usr/share/common-licenses
@@ -51,3 +35,17 @@ endif
sed -e "s&#OSNAME#&$(OSNAME)&g" etc/os-release > $(DESTDIR)/etc/os-release
mv $(DESTDIR)/etc/os-release $(DESTDIR)/usr/lib/os-release
ln -s ../usr/lib/os-release $(DESTDIR)/etc/os-release
+
+override_dh_link:
+ dh_link -X os-release
+
+override_dh_compress:
+ dh_compress -X README
+
+override_dh_fixperms:
+ dh_fixperms
+ cd debian/base-files && chown root:staff var/local
+ 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