From 6000faf9d7b1ec7758194d68a2ff68705a8e4825 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Fri, 14 Jun 2013 20:43:15 +0100 Subject: [PATCH] debian: Use Debhelper 8 rather than the awful custom script. --- Makefile.am | 8 ++++++ debian/catacomb-bin.install | 2 ++ debian/catacomb-dev.install | 6 +++++ debian/catacomb2.install | 2 ++ debian/compat | 1 + debian/control | 2 +- debian/rules | 62 +-------------------------------------------- 7 files changed, 21 insertions(+), 62 deletions(-) create mode 100644 debian/catacomb-bin.install create mode 100644 debian/catacomb-dev.install create mode 100644 debian/catacomb2.install create mode 100644 debian/compat diff --git a/Makefile.am b/Makefile.am index e29c36e..adecc61 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,11 +104,19 @@ EXTRA_DIST += debian/rules EXTRA_DIST += debian/control EXTRA_DIST += debian/changelog EXTRA_DIST += debian/copyright +EXTRA_DIST += debian/compat + +## catacomb2 +EXTRA_DIST += debian/catacomb2.install ## catacomb-bin +EXTRA_DIST += debian/catacomb-bin.install EXTRA_DIST += debian/catacomb-bin.prerm EXTRA_DIST += debian/catacomb-bin.postinst EXTRA_DIST += debian/catacomb-bin.config EXTRA_DIST += debian/catacomb-bin.templates +## catacomb-dev +EXTRA_DIST += debian/catacomb-dev.install + ###----- That's all, folks -------------------------------------------------- diff --git a/debian/catacomb-bin.install b/debian/catacomb-bin.install new file mode 100644 index 0000000..58cd505 --- /dev/null +++ b/debian/catacomb-bin.install @@ -0,0 +1,2 @@ +debian/tmp/usr/bin +debian/tmp/usr/share/man/man1 diff --git a/debian/catacomb-dev.install b/debian/catacomb-dev.install new file mode 100644 index 0000000..f781d2c --- /dev/null +++ b/debian/catacomb-dev.install @@ -0,0 +1,6 @@ +debian/tmp/usr/include +debian/tmp/usr/lib/catacomb/include +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/lib/libcatacomb.a +debian/tmp/usr/lib/libcatacomb.la +debian/tmp/usr/lib/libcatacomb.so diff --git a/debian/catacomb2.install b/debian/catacomb2.install new file mode 100644 index 0000000..b81d6ae --- /dev/null +++ b/debian/catacomb2.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libcatacomb.so.* +debian/tmp/usr/share/man/man5 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control index 1114107..4c332e4 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: catacomb Section: libs Priority: extra -Build-Depends: mlib-dev (>= 2.0.2), debhelper (>= 4.0.2) +Build-Depends: mlib-dev (>= 2.0.2), debhelper (>= 8) Maintainer: Mark Wooding Standards-Version: 3.1.1 diff --git a/debian/rules b/debian/rules index 00d76e4..cec98bb 100755 --- a/debian/rules +++ b/debian/rules @@ -1,62 +1,2 @@ #! /usr/bin/make -f - -export DH_COMPAT = 4 - -build: - rm -rf build deb-build - mkdir deb-build - cd deb-build; ../configure --prefix=/usr --mandir=/usr/share/man - make -C deb-build - make -C deb-build check - touch build - -clean: - dh_clean - rm -rf deb-build build - -install: build - dh_clean - make -C deb-build install DESTDIR=`pwd`/debian/catacomb2 - mkdir -p debian/catacomb-dev/usr - mv debian/catacomb2/usr/include debian/catacomb-dev/usr - mkdir -p debian/catacomb-dev/usr/lib - mv debian/catacomb2/usr/lib/catacomb debian/catacomb-dev/usr/lib - mv debian/catacomb2/usr/lib/pkgconfig debian/catacomb-dev/usr/lib - mv debian/catacomb2/usr/lib/*.a debian/catacomb-dev/usr/lib - mv debian/catacomb2/usr/lib/*.so debian/catacomb-dev/usr/lib - mv debian/catacomb2/usr/lib/*.la debian/catacomb-dev/usr/lib - mkdir -p debian/catacomb-bin/usr - mv debian/catacomb2/usr/bin debian/catacomb-bin/usr - mkdir -p debian/catacomb-bin/usr/share/man - mv debian/catacomb2/usr/share/man/man1 \ - debian/catacomb-bin/usr/share/man - -binary-indep: - -binary-arch: install - dh_testdir -a - dh_testroot -a - dh_compress -a - dh_installdocs -a - dh_strip -a - dh_makeshlibs -a -V - dh_undocumented -a - dh_shlibdeps -a - dh_installdebconf -a - dh_gencontrol -a - dh_fixperms -a - dh_installdeb -a - dh_md5sums -a - dh_builddeb -a - -binary: binary-indep binary-arch - -source: - rm -rf deb-build/*.tar.gz deb-build/=deb= - make -C deb-build dist - mkdir deb-build/=deb= - cd deb-build/=deb=; tar xvfz ../*.tar.gz - d=`pwd`; cd ..; dpkg-source -i -b $$d/deb-build/=deb=/* - rm -rf deb-build/=deb= - -.PHONY: binary binary-arch binary-indep clean install source +%:; dh $@ --parallel -Bdebian/build -- 2.11.0