Source: reiser4progs Version: 1.0.8-3 Severity: wishlist Tags: patch Dear Maintainer,
Converting the packaging scripts to use Debhelper 10 greatly reduces them in size and make them easier to maintain. Please consider applying the attached patch to perform the conversion. Thanks, Balint PS: This also fixes the FTBFS experienced in Ubuntu PPAs: https://launchpadlibrarian.net/322255279/buildlog_ubuntu-artful-arm64.reiser4progs_1.1.0-3ubuntu1_BUILDING.txt.gz -- Balint Reczey Debian & Ubuntu Developer
From 8ef5d680238c31c5cec88e6207e2ac2836bdb04e Mon Sep 17 00:00:00 2001 From: Balint Reczey <[email protected]> Date: Sat, 10 Jun 2017 18:57:50 -0700 Subject: [PATCH] Use debhelper 10 sequencer instead of cdbs Also convert package to multiarch --- debian/compat | 2 +- debian/control | 3 +- debian/libreiser4-dev.docs | 6 +++ debian/libreiser4-dev.install | 3 ++ debian/reiser4progs.docs | 6 +++ debian/reiser4progs.install | 4 ++ debian/reiser4progs.links | 2 + debian/rules | 105 ++---------------------------------------- 8 files changed, 29 insertions(+), 102 deletions(-) create mode 100644 debian/libreiser4-dev.docs create mode 100644 debian/libreiser4-dev.install create mode 100644 debian/reiser4progs.docs create mode 100644 debian/reiser4progs.install create mode 100644 debian/reiser4progs.links diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 0bc8ea5..76cd038 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: reiser4progs Section: admin Priority: optional Maintainer: Felix Zielcke <[email protected]> -Build-Depends: debhelper (>= 9), cdbs, libaal-dev (>= 1.0.6-3), libaal-dev (<< 1.0.7), uuid-dev, libreadline-gplv2-dev, dh-autoreconf +Build-Depends: debhelper (>= 10), libaal-dev (>= 1.0.6-3), libaal-dev (<< 1.0.7), uuid-dev, libreadline-gplv2-dev, dh-autoreconf Standards-Version: 3.9.6 Homepage: https://reiser4.wiki.kernel.org @@ -21,6 +21,7 @@ Package: libreiser4-dev Section: libdevel Priority: extra Architecture: linux-any +Multi-Arch: same Depends: ${misc:Depends}, libc6-dev | libc-dev, libaal-dev (>= 1.0.6), uuid-dev, libreadline-gplv2-dev, libncurses5-dev Description: Reiser4's filesystem access and manipulation library. Devel files These are the development files for Reiser4 libraries. diff --git a/debian/libreiser4-dev.docs b/debian/libreiser4-dev.docs new file mode 100644 index 0000000..87a7da0 --- /dev/null +++ b/debian/libreiser4-dev.docs @@ -0,0 +1,6 @@ +AUTHORS +BUGS +CREDITS +README +THANKS +TODO diff --git a/debian/libreiser4-dev.install b/debian/libreiser4-dev.install new file mode 100644 index 0000000..988af48 --- /dev/null +++ b/debian/libreiser4-dev.install @@ -0,0 +1,3 @@ +usr/include +usr/lib/*/*.a +/usr/share/aclocal \ No newline at end of file diff --git a/debian/reiser4progs.docs b/debian/reiser4progs.docs new file mode 100644 index 0000000..87a7da0 --- /dev/null +++ b/debian/reiser4progs.docs @@ -0,0 +1,6 @@ +AUTHORS +BUGS +CREDITS +README +THANKS +TODO diff --git a/debian/reiser4progs.install b/debian/reiser4progs.install new file mode 100644 index 0000000..43c80d0 --- /dev/null +++ b/debian/reiser4progs.install @@ -0,0 +1,4 @@ +usr/sbin/debugfs.reiser4 sbin +usr/sbin/fsck.reiser4 sbin +usr/sbin/measurefs.reiser4 sbin +usr/sbin/mkfs.reiser4 sbin diff --git a/debian/reiser4progs.links b/debian/reiser4progs.links new file mode 100644 index 0000000..934860c --- /dev/null +++ b/debian/reiser4progs.links @@ -0,0 +1,2 @@ +sbin/mkfs.reiser4 sbin/mkreiser4 +usr/share/man/man8/mkfs.reiser4.8.gz usr/share/man/man8/mkreiser4.8.gz diff --git a/debian/rules b/debian/rules index 1adeb49..95cf7d0 100755 --- a/debian/rules +++ b/debian/rules @@ -1,28 +1,7 @@ #! /usr/bin/make -f # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -SHELL := bash - - -include /usr/share/cdbs/1/rules/debhelper.mk - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif +export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS=hardening=-format @@ -33,82 +12,8 @@ ifneq (,$(filter $(DEB_BUILD_ARCH),mips mipsel)) export DEB_CFLAGS_MAINT_APPEND = -I$(CURDIR) endif -CFLAGS = `dpkg-buildflags --get CFLAGS` -CPPFLAGS = `dpkg-buildflags --get CPPFLAGS` -LDFLAGS = `dpkg-buildflags --get LDFLAGS` - -CONFIGURE = CFLAGS=$(CFLAGS) CPPFLAGS=$(CPPFLAGS) LDFLAGS=$(LDFLAGS) $(CURDIR)/configure \ - --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/usr \ - --mandir=\$${prefix}/share/man \ - --disable-shared \ - --enable-libminimal - -configure/reiser4progs configure/libreiser4-dev:: configure-reiser4progs-stamp -configure-reiser4progs-stamp: - dh_autoreconf - mkdir -p $(CURDIR)/build/reiser4progs - cd $(CURDIR)/build/reiser4progs && $(CONFIGURE) --with-readline - touch $@ - -#configure/mkreiser4-udeb configure/reiser4progs-udeb:: configure-udebs-stamp -#configure-udebs-stamp:: -# mkdir -p $(CURDIR)/build/udebs -# cd $(CURDIR)/build/udebs && $(CONFIGURE) --with-readline=no -# touch $@ - -build/libreiser4-dev build/reiser4progs:: build-reiser4progs-stamp -build-reiser4progs-stamp: - $(MAKE) -C $(CURDIR)/build/reiser4progs - touch $@ - -#build/mkreiser4-udeb build/reiser4progs-udeb:: build-udebs-stamp -#build-udebs-stamp:: -# $(MAKE) -C $(CURDIR)/build/udebs -# touch $@ - -install/reiser4progs:: install-reiser4progs-stamp -install-reiser4progs-stamp: - $(MAKE) -C $(CURDIR)/build/reiser4progs install DESTDIR=$(CURDIR)/debian/reiser4progs/ - mv $(CURDIR)/debian/reiser4progs/usr/sbin $(CURDIR)/debian/reiser4progs/ - rm -rf $(CURDIR)/debian/reiser4progs/sbin/make_reiser4 - rm -rf $(CURDIR)/debian/reiser4progs/usr/{include,lib,share/aclocal} - ln debian/reiser4progs/sbin/mkfs.reiser4 debian/reiser4progs/sbin/mkreiser4 - dh_link -preiser4progs usr/share/man/man8/mkfs.reiser4.8.gz usr/share/man/man8/mkreiser4.8.gz - -# this target can be activated at any time. It is no more required by -# install/libreiser4-dev since version 1.0.7-6.3 -debian/testLibreiser4: - cd debian; gcc -c -I ../include testLibreiser4.c; gcc testLibreiser4.o -L ../debian/libreiser4-dev/usr/lib -lreiser4 -laal -o testLibreiser4 && rm -f testLibreiser4.o testLibreiser4 - -install/libreiser4-dev:: install-libreiser4-dev-stamp -install-libreiser4-dev-stamp:: - $(MAKE) -C $(CURDIR)/build/reiser4progs install DESTDIR=$(CURDIR)/debian/libreiser4-dev/ - rm -rf $(CURDIR)/debian/libreiser4-dev/usr/{sbin,share/man} - rm -rf $(CURDIR)/debian/libreiser4-dev/usr/share/doc/{AUTHORS,BUGS,README,THANKS} - rm -f $(CURDIR)/debian/libreiser4-dev/usr/lib/*.la - -#install/mkreiser4-udeb:: install-mkreiser4-udeb-stamp -#install-mkreiser4-udeb-stamp:: -# $(MAKE) -C $(CURDIR)/build/udebs install DESTDIR=$(CURDIR)/debian/mkreiser4-udeb/ -# mv $(CURDIR)/debian/mkreiser4-udeb/usr/sbin $(CURDIR)/debian/mkreiser4-udeb/ -# rm -rf $(CURDIR)/debian/mkreiser4-udeb/sbin/make_reiser4 -# rm -rf $(CURDIR)/debian/mkreiser4-udeb/usr -# rm -rf $(CURDIR)/debian/mkreiser4-udeb/sbin/{debugfs.reiser4,fsck.reiser4,measurefs.reiser4} - -#install/reiser4progs-udeb:: install-reiser4progs-udeb-stamp -#install-reiser4progs-udeb-stamp:: -# $(MAKE) -C $(CURDIR)/build/udebs install DESTDIR=$(CURDIR)/debian/reiser4progs-udeb/ -# mv $(CURDIR)/debian/reiser4progs-udeb/usr/sbin $(CURDIR)/debian/reiser4progs-udeb/ -# rm -rf $(CURDIR)/debian/reiser4progs-udeb/sbin/make_reiser4 -# rm -rf $(CURDIR)/debian/reiser4progs-udeb/usr -# rm -rf $(CURDIR)/debian/reiser4progs-udeb/sbin/{mkfs.reiser4,measurefs.reiser4} +%: + dh $@ --with autoreconf -clean:: - dh_autoreconf_clean - dh_clean - rm -rf build - rm -f *-stamp - # clean test files - cd debian; rm -f testLibreiser4.o testLibreiser4 +override_dh_auto_configure: + dh_auto_configure -- --disable-shared --enable-minimal --with-readline -- 2.11.0
