Control: tags -1 + patch On Fri, 29 Jul 2016 02:19:30 +0200 (CEST) Santiago Vila wrote:
> I also recommend switching to dh, but in the meantime, the attached > patch should work. Unfortunately that patch does not work. I couldn't figure out how to fix it so I made a tested and working patch to switch to dh, attached. The generated binary packages have the same set of files and work. The patch also fixes the other libforms RC bug, CCing it. I have uploaded this NMU to the 7-days delayed queue to give the maintainer a chance to come up with a non-dh version of the patch. -- bye, pabs https://wiki.debian.org/PaulWise
diff -Nru libforms-1.2.3/debian/changelog libforms-1.2.3/debian/changelog --- libforms-1.2.3/debian/changelog 2014-10-04 13:18:52.000000000 +0800 +++ libforms-1.2.3/debian/changelog 2016-08-24 13:31:03.000000000 +0800 @@ -1,3 +1,10 @@ +libforms (1.2.3-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * Switch to the dh sequencer (Closes: #822042, #805947) + + -- Paul Wise <p...@debian.org> Wed, 24 Aug 2016 13:31:03 +0800 + libforms (1.2.3-1.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru libforms-1.2.3/debian/clean libforms-1.2.3/debian/clean --- libforms-1.2.3/debian/clean 1970-01-01 08:00:00.000000000 +0800 +++ libforms-1.2.3/debian/clean 2016-08-24 13:31:03.000000000 +0800 @@ -0,0 +1,9 @@ +doc/xforms.aux +doc/xforms.fn +doc/xforms.fns +doc/xforms.log +doc/xforms.toc +doc/xforms.tp +doc/xforms.tps +doc/xforms.vr +doc/xforms.vrs diff -Nru libforms-1.2.3/debian/control libforms-1.2.3/debian/control --- libforms-1.2.3/debian/control 2014-10-04 12:48:23.000000000 +0800 +++ libforms-1.2.3/debian/control 2016-08-24 13:30:18.000000000 +0800 @@ -2,7 +2,8 @@ Section: libs Priority: optional Maintainer: Peter S Galbraith <p...@debian.org> -Build-Depends: debhelper (>= 7), dpkg (>= 1.15.4) | install-info, libxpm-dev, libjpeg-dev, libtiff-dev, libgl1-mesa-dev, libxext-dev, texi2html, texinfo, texlive-generic-recommended, texlive-latex-base, gsfonts, dh-autoreconf +Build-Depends: debhelper (>= 8.9.7~), dpkg (>= 1.15.4) | install-info, libxpm-dev, libjpeg-dev, libtiff-dev, libgl1-mesa-dev, libxext-dev, texinfo, dh-autoreconf +Build-Depends-Indep: texi2html, texlive-generic-recommended, texlive-latex-base, gsfonts Standards-Version: 3.8.4 Homepage: http://savannah.nongnu.org/projects/xforms/ diff -Nru libforms-1.2.3/debian/libforms-bin.manpages libforms-1.2.3/debian/libforms-bin.manpages --- libforms-1.2.3/debian/libforms-bin.manpages 1970-01-01 08:00:00.000000000 +0800 +++ libforms-1.2.3/debian/libforms-bin.manpages 2016-08-24 13:18:56.000000000 +0800 @@ -0,0 +1,2 @@ +fd2ps/fd2ps.1 +fdesign/fdesign.1 diff -Nru libforms-1.2.3/debian/libforms-dev.info libforms-1.2.3/debian/libforms-dev.info --- libforms-1.2.3/debian/libforms-dev.info 1970-01-01 08:00:00.000000000 +0800 +++ libforms-1.2.3/debian/libforms-dev.info 2016-08-24 13:17:39.000000000 +0800 @@ -0,0 +1 @@ +doc/xforms.info* diff -Nru libforms-1.2.3/debian/libforms-dev.links libforms-1.2.3/debian/libforms-dev.links --- libforms-1.2.3/debian/libforms-dev.links 1970-01-01 08:00:00.000000000 +0800 +++ libforms-1.2.3/debian/libforms-dev.links 2016-08-24 13:13:56.000000000 +0800 @@ -0,0 +1 @@ +usr/share/man/man5/xforms.5.gz usr/share/man/man5/libforms1.5.gz diff -Nru libforms-1.2.3/debian/libforms-dev.manpages libforms-1.2.3/debian/libforms-dev.manpages --- libforms-1.2.3/debian/libforms-dev.manpages 1970-01-01 08:00:00.000000000 +0800 +++ libforms-1.2.3/debian/libforms-dev.manpages 2016-08-24 13:19:16.000000000 +0800 @@ -0,0 +1 @@ +lib/xforms.5 diff -Nru libforms-1.2.3/debian/libforms-doc.docs libforms-1.2.3/debian/libforms-doc.docs --- libforms-1.2.3/debian/libforms-doc.docs 1970-01-01 08:00:00.000000000 +0800 +++ libforms-1.2.3/debian/libforms-doc.docs 2016-08-24 13:18:12.000000000 +0800 @@ -0,0 +1 @@ +doc/xforms.pdf diff -Nru libforms-1.2.3/debian/rules libforms-1.2.3/debian/rules --- libforms-1.2.3/debian/rules 2014-10-04 13:18:43.000000000 +0800 +++ libforms-1.2.3/debian/rules 2016-08-24 13:31:03.000000000 +0800 @@ -1,77 +1,19 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. +#export DH_VERBOSE = 1 -# Uncomment this to turn on verbose mode. -# export DH_VERBOSE=1 -export DH_OPTIONS= - - -autoreconf: - rm -f acinclude.m4 - autoreconf -fi - -build: patch-stamp build-stamp -build-stamp: - dh_testdir - dh_autoreconf debian/rules -- autoreconf - ./configure --prefix=/usr - make - (cd doc; make info pdf html) - touch build-stamp - -clean: unpatch - dh_testdir - dh_testroot - dh_auto_clean - rm -f fdesign/Makefile demos/Makefile fd2ps/Makefile gl/Makefile - rm -f lib/include/Makefile lib/Makefile image/Makefile Makefile - rm -f build-stamp - dh_autoreconf_clean - dh_clean - -# Build architecture-independent files here. -binary-indep: build - -# Build architecture-dependent files here. - -build-arch: DH_OPTIONS=-a -build-arch: build - -install-arch: build - dh_testdir - dh_testroot - dh_prep - $(MAKE) install DESTDIR=`pwd`/debian/tmp - dh_installdirs - dh_install - rm -fR debian/libforms-doc/usr/share/doc/libforms-doc/html/images/CVS - dh_installman -p libforms-bin fd2ps/fd2ps.1 fdesign/fdesign.1 - dh_installman -p libforms-dev lib/xforms.5 - (cd debian/libforms-dev/usr/share/man/man5/ ; ln -s xforms.5.gz libforms1.5.gz) - dh_installdocs - dh_installdocs -p libforms-doc doc/xforms.pdf - dh_installchangelogs - dh_installinfo -p libforms-dev doc/xforms.info* -# for i in `ls debian/*.lintian-overrides`; do \ -# install -p -m 0644 -o root -g root $$i \ -# debian/`basename $$i .lintian-overrides`/usr/share/lintian/overrides/`basename $$i .lintian-overrides`; \ -# done - dh_strip - dh_compress - dh_fixperms - -binary-arch: DH_options=-a -binary-arch: build install-arch - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb +%: + dh $@ --parallel --with autoreconf +override_dh_autoreconf: + dh_autoreconf ./autogen.sh -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false +override_dh_auto_build-arch: + dh_auto_build -- all + $(MAKE) -C doc info -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install-arch patch-stamp unpatch +override_dh_auto_build-indep: + dh_auto_build -- -C doc html pdf + +override_dh_auto_test-indep: + +override_dh_auto_install-indep:
signature.asc
Description: This is a digitally signed message part
