Improve Debian Packaging (#319)

* Improve Debian packaging

- build a single tarball with all Debian packaging (workaround for an OBS bug
  https://github.com/openSUSE/obs-service-source_validator/pull/41)
- rename debian/ to package_deb/ to not conflict with
  upstream packaging (github#310)

* Use dists/debian path for the Debian files

diff --git a/.gitignore b/.gitignore
index d222ed9deb6b087c4f57168ecc26e6b10b903503..8d775c53fa16c8c1e0f8e857fbc59af269620321 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ autom4te.cache
 config.*
 configure
 depcomp
+/debian
 install-sh
 libtool
 ltmain.sh

diff --git a/.travis.ubuntu.sh b/.travis.ubuntu.sh
index 888e4a14a1ac16c7dcd09e3a939eb3540f674fd9..18f8d04df907d916aa9f6d587866614e5a94828f 100755 (executable)
--- a/.travis.ubuntu.sh
+++ b/.travis.ubuntu.sh
@@ -4,8 +4,8 @@ set -e -x
 
 make -f Makefile.repo
 
-# convert the OBS Debian files to the native Debian files
-(cd debian && rename 's/^debian\.//' debian.*)
+# copy the Debian files to the expected place
+cp -a dists/debian debian
 
 # build binary packages
 dpkg-buildpackage -j`nproc` -rfakeroot -b

diff --git a/Makefile.am b/Makefile.am
index f501a8a1d653477e7518511df269eedaf2c39282..d16f124646f19b92e63cb4f880e9ad4fa33494ba 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,7 +59,8 @@ package-clean:
 # $< is the first depencency of the rule, i.e. snapper-$(VERSION).tar.gz in this case.
 #
 package: snapper-$(VERSION).tar.bz2 package-clean
-       cp debian/* package/
+       tar cfzv package/debian.tar.gz --transform='s|dists/||' --show-transformed --exclude='*.in' dists/debian/*
+       cp dists/debian/*.dsc.in package/
        echo "$(shell md5sum $< | sed -e 's/\s.*//') $(shell wc -c $<)" >>package/snapper-Debian.dsc.in
        echo "$(shell md5sum $< | sed -e 's/\s.*//') $(shell wc -c $<)" >>package/snapper-xUbuntu.dsc.in
        for FLAV in $(DEBIAN_FLAVOURS); do cp -v package/snapper-Debian.dsc.in  package/snapper-$${FLAV}.dsc; done

diff --git a/configure.ac b/configure.ac
index f8199b06f77249dc46ab5bd07d9c5aeec84e8697..03ee675d9e742af59f4feb15d889dedcef2ee714 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -183,6 +183,6 @@ AC_OUTPUT(
        testsuite-real/Makefile
        testsuite-cmp/Makefile
        package/snapper.spec:snapper.spec.in
-        debian/snapper-Debian.dsc.in:debian/snapper-Debian.dsc.in.in
-        debian/snapper-xUbuntu.dsc.in:debian/snapper-xUbuntu.dsc.in.in
+       dists/debian/snapper-Debian.dsc.in:dists/debian/snapper-Debian.dsc.in.in
+       dists/debian/snapper-xUbuntu.dsc.in:dists/debian/snapper-xUbuntu.dsc.in.in
 )

diff --git a/debian/.gitignore b/dists/debian/.gitignore
similarity index 100%
rename from debian/.gitignore
rename to dists/debian/.gitignore

diff --git a/debian/debian.changelog b/dists/debian/changelog
similarity index 100%
rename from debian/debian.changelog
rename to dists/debian/changelog

diff --git a/debian/debian.compat b/dists/debian/compat
similarity index 100%
rename from debian/debian.compat
rename to dists/debian/compat

diff --git a/debian/debian.control b/dists/debian/control
similarity index 100%
rename from debian/debian.control
rename to dists/debian/control

diff --git a/debian/debian.libpam-snapper.install b/dists/debian/libpam-snapper.install
similarity index 100%
rename from debian/debian.libpam-snapper.install
rename to dists/debian/libpam-snapper.install

diff --git a/debian/debian.libpam-snapper.manpages b/dists/debian/libpam-snapper.manpages
similarity index 100%
rename from debian/debian.libpam-snapper.manpages
rename to dists/debian/libpam-snapper.manpages

diff --git a/debian/debian.libsnapper-dev.install b/dists/debian/libsnapper-dev.install
similarity index 100%
rename from debian/debian.libsnapper-dev.install
rename to dists/debian/libsnapper-dev.install

diff --git a/debian/debian.libsnapper.install b/dists/debian/libsnapper.install
similarity index 100%
rename from debian/debian.libsnapper.install
rename to dists/debian/libsnapper.install

diff --git a/debian/debian.rules b/dists/debian/rules
similarity index 100%
rename from debian/debian.rules
rename to dists/debian/rules

diff --git a/debian/snapper-Debian.dsc.in.in b/dists/debian/snapper-Debian.dsc.in.in
similarity index 100%
rename from debian/snapper-Debian.dsc.in.in
rename to dists/debian/snapper-Debian.dsc.in.in

diff --git a/debian/snapper-xUbuntu.dsc.in.in b/dists/debian/snapper-xUbuntu.dsc.in.in
similarity index 100%
rename from debian/snapper-xUbuntu.dsc.in.in
rename to dists/debian/snapper-xUbuntu.dsc.in.in

diff --git a/debian/debian.snapper-zypp-plugin.install b/dists/debian/snapper-zypp-plugin.install
similarity index 100%
rename from debian/debian.snapper-zypp-plugin.install
rename to dists/debian/snapper-zypp-plugin.install

diff --git a/debian/debian.snapper-zypp-plugin.manpages b/dists/debian/snapper-zypp-plugin.manpages
similarity index 100%
rename from debian/debian.snapper-zypp-plugin.manpages
rename to dists/debian/snapper-zypp-plugin.manpages

diff --git a/debian/debian.snapper.install b/dists/debian/snapper.install
similarity index 100%
rename from debian/debian.snapper.install
rename to dists/debian/snapper.install

diff --git a/debian/debian.snapper.manpages b/dists/debian/snapper.manpages
similarity index 100%
rename from debian/debian.snapper.manpages
rename to dists/debian/snapper.manpages