diff -Nru pkg-create-dbgsym-0.70/debian/changelog pkg-create-dbgsym-0.72/debian/changelog --- pkg-create-dbgsym-0.70/debian/changelog 2015-10-23 08:50:29.000000000 +0000 +++ pkg-create-dbgsym-0.72/debian/changelog 2016-03-15 21:39:20.000000000 +0000 @@ -1,3 +1,17 @@ +pkg-create-dbgsym (0.72) xenial; urgency=medium + + * Remove all the code to deal with DH_COMPAT=1, as debhelper now fails + for any DH_COMPAT less than 4 (and will soon do so for less than 5). + + -- Adam Conrad Tue, 15 Mar 2016 15:20:52 -0600 + +pkg-create-dbgsym (0.71) xenial; urgency=medium + + * Fix race in dpkg-gencontrol by writing to one file list per package. + * Drop deprecated '-is' and '-ip' options from dpkg-gencontrol calls. + + -- Adam Conrad Tue, 15 Mar 2016 15:06:33 -0600 + pkg-create-dbgsym (0.70) xenial; urgency=medium * Add test case for a package using dh. diff -Nru pkg-create-dbgsym-0.70/dh_gencontrol pkg-create-dbgsym-0.72/dh_gencontrol --- pkg-create-dbgsym-0.70/dh_gencontrol 2015-06-01 12:59:14.000000000 +0000 +++ pkg-create-dbgsym-0.72/dh_gencontrol 2016-03-15 21:37:30.000000000 +0000 @@ -135,24 +135,6 @@ dbg "packages to act on: $actpkgs" dbg "ignored packages: $ignorepkgs" -# check for debhelper compat level 1 -dhcompat1=1 -if [ -e debian/compat ]; then - if [ "`cat debian/compat`" != 1 ]; then - unset dhcompat1 - fi -fi -if grep -q '^[[:space:]]*\(export[[:space:]]*\)\?DH_COMPAT[[:space:]]*:\?=[[:space:]]*[2-9]\>' debian/rules; then - unset dhcompat1 -elif grep -q '^[[:space:]]*\(export[[:space:]]*\)\?DH_COMPAT[[:space:]]*:\?=[[:space:]]*1\>' debian/rules; then - dhcompat1=1 -fi - -if [ -n "$dhcompat1" ]; then - first_control_pkg="`grep -m 1 ^Package debian/control | cut -f2- -d\ `" - dbg "using obsolete debhelper compat mode 1" -fi - # process all packages for p in $actpkgs; do if in_list "$p" "$ignorepkgs" || @@ -162,8 +144,6 @@ if [ -n "$pkgdirarg" ]; then pkgdir="$pkgdirarg" - elif [ -n "$dhcompat1" -a $p = "$first_control_pkg" ]; then - pkgdir=debian/tmp else pkgdir=debian/$p fi diff -Nru pkg-create-dbgsym-0.70/dh_strip pkg-create-dbgsym-0.72/dh_strip --- pkg-create-dbgsym-0.70/dh_strip 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/dh_strip 2016-03-15 21:37:09.000000000 +0000 @@ -176,24 +176,6 @@ dbg "packages to act on: $actpkgs" dbg "ignored packages: $ignorepkgs" -# check for debhelper compat level 1 -dhcompat1=1 -if [ -e debian/compat ]; then - if [ "`cat debian/compat`" != 1 ]; then - unset dhcompat1 - fi -fi -if grep -q '^[[:space:]]*\(export[[:space:]]*\)\?DH_COMPAT[[:space:]]*:\?=[[:space:]]*[2-9]\>' debian/rules; then - unset dhcompat1 -elif grep -q '^[[:space:]]*\(export[[:space:]]*\)\?DH_COMPAT[[:space:]]*:\?=[[:space:]]*1\>' debian/rules; then - dhcompat1=1 -fi - -if [ -n "$dhcompat1" ]; then - first_control_pkg="`grep -m 1 ^Package debian/control | cut -f2- -d\ `" - dbg "using obsolete debhelper compat mode 1" -fi - # process all packages for p in $actpkgs; do if in_list "$p" "$ignorepkgs" || @@ -203,8 +185,6 @@ if [ -n "$pkgdirarg" ]; then pkgdir="$pkgdirarg" - elif [ -n "$dhcompat1" -a $p = "$first_control_pkg" ]; then - pkgdir=debian/tmp else pkgdir=debian/$p fi diff -Nru pkg-create-dbgsym-0.70/pkg_create_dbgsym pkg-create-dbgsym-0.72/pkg_create_dbgsym --- pkg-create-dbgsym-0.70/pkg_create_dbgsym 2015-10-23 08:47:52.000000000 +0000 +++ pkg-create-dbgsym-0.72/pkg_create_dbgsym 2016-03-15 21:06:30.000000000 +0000 @@ -188,13 +188,13 @@ # generate a control file for current package (since it is usually not yet # existing) and adapt it to be suitable for the dbgsym package perl -p000 -e 's/^#.*?\n//msg; s/^(?:Pre-Depends|Depends|Recommends|Suggests|Conflicts|Provides|Replaces|Breaks|Enhances|Essential):.*?\n(?![ \t])//msg' debian/control | - dpkg-gencontrol -c- -fdhstrip-dummy-debian-files -p$pkgname -is -ip -Pdebian/$pkgname-dbgsym -Tdebian/$pkgname.substvars -O | + dpkg-gencontrol -c- -fdhstrip-dummy-debian-files.${pkgname} -p$pkgname -Pdebian/$pkgname-dbgsym -Tdebian/$pkgname.substvars -O | sed "s/^Priority:.*$/Priority: extra/; s/^Version: \(.*\)$/&\nDepends: $depends/; s/^Package:.*$/&-dbgsym/; s/^Description:.*$/Description: debug symbols for package $pkgname/" \ > $dp/DEBIAN/control -rm -f dhstrip-dummy-debian-files +rm -f dhstrip-dummy-debian-files.${pkgname} # binaries named the same as the source will lack a Source field. # since we are renaming binaries, we might need to add one. diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compat1/crash2.c pkg-create-dbgsym-0.72/tests/dhtest.compat1/crash2.c --- pkg-create-dbgsym-0.70/tests/dhtest.compat1/crash2.c 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compat1/crash2.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -/* crash.c - demo program for libcrashreport - - (c) 2004 Martin Pitt - - This file is public domain. -*/ - -#include -#include -#include - -double h() -{ - double a = 1./0; - if (isinf(a)) - raise(SIGFPE); - return a; -} - -int g( int x, int y ) -{ - - return x+y+(int) h(); -} - -int f( int x ) -{ - return g( x, 42 ); -} - -int -main() -{ - int x; - - x = f(1); - printf( "x = %i, terminating normally now.\n", x ); - return 0; -} diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compat1/crash.c pkg-create-dbgsym-0.72/tests/dhtest.compat1/crash.c --- pkg-create-dbgsym-0.70/tests/dhtest.compat1/crash.c 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compat1/crash.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -/* crash.c - demo program for libcrashreport - - (c) 2004 Martin Pitt - - This file is public domain. -*/ - -#include - -void h(char* p) { - p[1] = 'a'; -} - -int g( int x, int y ) -{ - char* s = NULL; - h(s); - return x+y; -} - -int f( int x ) -{ - return g( x, 42 ); -} - -int -main() -{ - int x; - - x = f(1); - printf( "x = %i, terminating normally now.\n", x ); - return 0; -} diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compat1/debian/changelog pkg-create-dbgsym-0.72/tests/dhtest.compat1/debian/changelog --- pkg-create-dbgsym-0.70/tests/dhtest.compat1/debian/changelog 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compat1/debian/changelog 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -dhtest.compat1 (2:3.4) foo; urgency=low - - * Initial release. - - -- Martin Pitt Fri, 16 Jun 2006 10:49:56 +0200 diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compat1/debian/control pkg-create-dbgsym-0.72/tests/dhtest.compat1/debian/control --- pkg-create-dbgsym-0.70/tests/dhtest.compat1/debian/control 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compat1/debian/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -Source: dhtest.compat1 -Section: utils -Priority: extra -Maintainer: Martin Pitt -Build-Depends: debhelper (>= 4.1.0) -Standards-Version: 3.7.2 - -Package: dhtest1 -Architecture: any -Depends: ${shlibs:Depends} -Description: crash with a SIGSEGV - Test package - -Package: dhtest2 -Architecture: any -Depends: ${shlibs:Depends} -Description: crash with a SIGFPE - Test package - -Package: dhtestall -Architecture: all -Depends: ${shlibs:Depends} -Description: dummy arch-all package - Test package - diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compat1/debian/copyright pkg-create-dbgsym-0.72/tests/dhtest.compat1/debian/copyright --- pkg-create-dbgsym-0.70/tests/dhtest.compat1/debian/copyright 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compat1/debian/copyright 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -foo diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compat1/debian/rules pkg-create-dbgsym-0.72/tests/dhtest.compat1/debian/rules --- pkg-create-dbgsym-0.70/tests/dhtest.compat1/debian/rules 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compat1/debian/rules 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -#!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This has to be exported to make some magic below work. -export DH_OPTIONS - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -#Architecture -build: build-arch build-indep - -build-arch: build-arch-stamp -build-arch-stamp: - $(MAKE) - touch build-arch-stamp - -build-indep: - -clean: - dh_testdir - dh_testroot - rm -f build-arch-stamp build-indep-stamp - -$(MAKE) clean - dh_clean - -install: install-indep install-arch -install-indep: - dh_testdir - dh_testroot - dh_clean -k -i - dh_installdirs -i - -install-arch: - dh_testdir - dh_testroot - dh_clean -k -s - dh_installdirs -s - install -D -m 755 crash debian/tmp/usr/bin/crash - install -D -m 755 crash2 debian/dhtest2/usr/bin/crash2 - -# Must not depend on anything. This is to be called by -# binary-arch/binary-indep -# in another 'make' thread. -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture independant packages using the common target. -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -# Build architecture dependant packages using the common target. -binary-arch: build-arch install-arch - $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common - -binary: binary-arch binary-indep -.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compat1/Makefile pkg-create-dbgsym-0.72/tests/dhtest.compat1/Makefile --- pkg-create-dbgsym-0.70/tests/dhtest.compat1/Makefile 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compat1/Makefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -CFLAGS= -g -Wall -W -O0 - -LIBNAME=crashrep - -all: crash crash2 - -crash: crash.o - $(CC) $^ -o $@ - -crash2: crash2.o - $(CC) $^ -o $@ - -clean: - rm -f *.o crash crash2 - -install: all - install -d $(DESTDIR)/usr/bin - install crash crash2 $(DESTDIR)/usr/bin diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compat1override/crash2.c pkg-create-dbgsym-0.72/tests/dhtest.compat1override/crash2.c --- pkg-create-dbgsym-0.70/tests/dhtest.compat1override/crash2.c 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compat1override/crash2.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -/* crash.c - demo program for libcrashreport - - (c) 2004 Martin Pitt - - This file is public domain. -*/ - -#include -#include -#include - -double h() -{ - double a = 1./0; - if (isinf(a)) - raise(SIGFPE); - return a; -} - -int g( int x, int y ) -{ - - return x+y+(int) h(); -} - -int f( int x ) -{ - return g( x, 42 ); -} - -int -main() -{ - int x; - - x = f(1); - printf( "x = %i, terminating normally now.\n", x ); - return 0; -} diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compat1override/crash.c pkg-create-dbgsym-0.72/tests/dhtest.compat1override/crash.c --- pkg-create-dbgsym-0.70/tests/dhtest.compat1override/crash.c 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compat1override/crash.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -/* crash.c - demo program for libcrashreport - - (c) 2004 Martin Pitt - - This file is public domain. -*/ - -#include - -void h(char* p) { - p[1] = 'a'; -} - -int g( int x, int y ) -{ - char* s = NULL; - h(s); - return x+y; -} - -int f( int x ) -{ - return g( x, 42 ); -} - -int -main() -{ - int x; - - x = f(1); - printf( "x = %i, terminating normally now.\n", x ); - return 0; -} diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compat1override/debian/changelog pkg-create-dbgsym-0.72/tests/dhtest.compat1override/debian/changelog --- pkg-create-dbgsym-0.70/tests/dhtest.compat1override/debian/changelog 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compat1override/debian/changelog 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -dhtest.compat1override (2:3.4) foo; urgency=low - - * Initial release. - - -- Martin Pitt Fri, 16 Jun 2006 10:49:56 +0200 diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compat1override/debian/compat pkg-create-dbgsym-0.72/tests/dhtest.compat1override/debian/compat --- pkg-create-dbgsym-0.70/tests/dhtest.compat1override/debian/compat 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compat1override/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -4 diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compat1override/debian/control pkg-create-dbgsym-0.72/tests/dhtest.compat1override/debian/control --- pkg-create-dbgsym-0.70/tests/dhtest.compat1override/debian/control 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compat1override/debian/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -Source: dhtest.compat1override -Section: utils -Priority: extra -Maintainer: Martin Pitt -Build-Depends: debhelper (>= 4.1.0) -Standards-Version: 3.7.2 - -Package: dhtest1 -Architecture: any -Depends: ${shlibs:Depends} -Description: crash with a SIGSEGV - Test package - -Package: dhtest2 -Architecture: any -Depends: ${shlibs:Depends} -Description: crash with a SIGFPE - Test package - -Package: dhtestall -Architecture: all -Depends: ${shlibs:Depends} -Description: dummy arch-all package - Test package - diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compat1override/debian/copyright pkg-create-dbgsym-0.72/tests/dhtest.compat1override/debian/copyright --- pkg-create-dbgsym-0.70/tests/dhtest.compat1override/debian/copyright 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compat1override/debian/copyright 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -foo diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compat1override/debian/rules pkg-create-dbgsym-0.72/tests/dhtest.compat1override/debian/rules --- pkg-create-dbgsym-0.70/tests/dhtest.compat1override/debian/rules 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compat1override/debian/rules 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -#!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This has to be exported to make some magic below work. -export DH_OPTIONS - -export DH_COMPAT=1 - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -#Architecture -build: build-arch build-indep - -build-arch: build-arch-stamp -build-arch-stamp: - $(MAKE) - touch build-arch-stamp - -build-indep: - -clean: - dh_testdir - dh_testroot - rm -f build-arch-stamp build-indep-stamp - -$(MAKE) clean - dh_clean - -install: install-indep install-arch -install-indep: - dh_testdir - dh_testroot - dh_clean -k -i - dh_installdirs -i - -install-arch: - dh_testdir - dh_testroot - dh_clean -k -s - dh_installdirs -s - install -D -m 755 crash debian/tmp/usr/bin/crash - install -D -m 755 crash2 debian/dhtest2/usr/bin/crash2 - -# Must not depend on anything. This is to be called by -# binary-arch/binary-indep -# in another 'make' thread. -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture independant packages using the common target. -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -# Build architecture dependant packages using the common target. -binary-arch: build-arch install-arch - $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common - -binary: binary-arch binary-indep -.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compat1override/Makefile pkg-create-dbgsym-0.72/tests/dhtest.compat1override/Makefile --- pkg-create-dbgsym-0.70/tests/dhtest.compat1override/Makefile 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compat1override/Makefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -CFLAGS= -g -Wall -W -O0 - -LIBNAME=crashrep - -all: crash crash2 - -crash: crash.o - $(CC) $^ -o $@ - -crash2: crash2.o - $(CC) $^ -o $@ - -clean: - rm -f *.o crash crash2 - -install: all - install -d $(DESTDIR)/usr/bin - install crash crash2 $(DESTDIR)/usr/bin diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compatenvvar/crash2.c pkg-create-dbgsym-0.72/tests/dhtest.compatenvvar/crash2.c --- pkg-create-dbgsym-0.70/tests/dhtest.compatenvvar/crash2.c 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compatenvvar/crash2.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -/* crash.c - demo program for libcrashreport - - (c) 2004 Martin Pitt - - This file is public domain. -*/ - -#include -#include -#include - -double h() -{ - double a = 1./0; - if (isinf(a)) - raise(SIGFPE); - return a; -} - -int g( int x, int y ) -{ - - return x+y+(int) h(); -} - -int f( int x ) -{ - return g( x, 42 ); -} - -int -main() -{ - int x; - - x = f(1); - printf( "x = %i, terminating normally now.\n", x ); - return 0; -} diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compatenvvar/crash.c pkg-create-dbgsym-0.72/tests/dhtest.compatenvvar/crash.c --- pkg-create-dbgsym-0.70/tests/dhtest.compatenvvar/crash.c 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compatenvvar/crash.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -/* crash.c - demo program for libcrashreport - - (c) 2004 Martin Pitt - - This file is public domain. -*/ - -#include - -void h(char* p) { - p[1] = 'a'; -} - -int g( int x, int y ) -{ - char* s = NULL; - h(s); - return x+y; -} - -int f( int x ) -{ - return g( x, 42 ); -} - -int -main() -{ - int x; - - x = f(1); - printf( "x = %i, terminating normally now.\n", x ); - return 0; -} diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compatenvvar/debian/changelog pkg-create-dbgsym-0.72/tests/dhtest.compatenvvar/debian/changelog --- pkg-create-dbgsym-0.70/tests/dhtest.compatenvvar/debian/changelog 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compatenvvar/debian/changelog 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -dhtest.compatenvvar (1:2.3-1) foo; urgency=low - - * Initial release. - - -- Martin Pitt Fri, 16 Jun 2006 10:49:56 +0200 diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compatenvvar/debian/control pkg-create-dbgsym-0.72/tests/dhtest.compatenvvar/debian/control --- pkg-create-dbgsym-0.70/tests/dhtest.compatenvvar/debian/control 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compatenvvar/debian/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Source: dhtest.compatenvvar -Section: utils -Priority: extra -Maintainer: Martin Pitt -Build-Depends: debhelper (>= 4.1.0) -Standards-Version: 3.7.2 - -Package: dhtest1 -Architecture: any -Depends: ${shlibs:Depends} -Description: crash with a SIGSEGV - Test package - diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compatenvvar/debian/copyright pkg-create-dbgsym-0.72/tests/dhtest.compatenvvar/debian/copyright --- pkg-create-dbgsym-0.70/tests/dhtest.compatenvvar/debian/copyright 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compatenvvar/debian/copyright 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -foo diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compatenvvar/debian/rules pkg-create-dbgsym-0.72/tests/dhtest.compatenvvar/debian/rules --- pkg-create-dbgsym-0.70/tests/dhtest.compatenvvar/debian/rules 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compatenvvar/debian/rules 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -#!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -export DH_COMPAT=3 - -# This has to be exported to make some magic below work. -export DH_OPTIONS - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -#Architecture -build: build-arch build-indep - -build-arch: build-arch-stamp -build-arch-stamp: - $(MAKE) - touch build-arch-stamp - -build-indep: - -clean: - dh_testdir - dh_testroot - rm -f build-arch-stamp build-indep-stamp - -$(MAKE) clean - dh_clean - -install: install-arch - -install-arch: - dh_testdir - dh_testroot - dh_clean -k -s - dh_installdirs -s - $(MAKE) install DESTDIR=$(CURDIR)/debian/dhtest1 - - # install hardlink - ln debian/dhtest1/usr/bin/crash debian/dhtest1/usr/bin/crashl - -# Build architecture dependant packages using the common target. -binary-arch: build-arch install-arch - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-arch binary-indep -.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch diff -Nru pkg-create-dbgsym-0.70/tests/dhtest.compatenvvar/Makefile pkg-create-dbgsym-0.72/tests/dhtest.compatenvvar/Makefile --- pkg-create-dbgsym-0.70/tests/dhtest.compatenvvar/Makefile 2015-06-01 10:19:34.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/dhtest.compatenvvar/Makefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -CFLAGS= -g -Wall -W -O0 - -LIBNAME=crashrep - -all: crash crash2 - -crash: crash.o - $(CC) $^ -o $@ - -crash2: crash2.o - $(CC) $^ -o $@ - -clean: - rm -f *.o crash crash2 - -install: all - install -d $(DESTDIR)/usr/bin - install crash crash2 $(DESTDIR)/usr/bin diff -Nru pkg-create-dbgsym-0.70/tests/run pkg-create-dbgsym-0.72/tests/run --- pkg-create-dbgsym-0.70/tests/run 2015-10-23 08:47:58.000000000 +0000 +++ pkg-create-dbgsym-0.72/tests/run 2016-03-15 21:35:07.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh -e -TESTSOURCES="dhtest dhtest.doublestrip dhtest.samename dhtest.substvars dhtest.whitespace dhtest.nostrip dhtest.noargs dhtest.archspecific dhtest.tmpdirarg dhtest.compat1 dhtest.compat1override dhtest.compatenvvar dhtest.dbg dhtest.dbg.buildid dhtest.dbg2 dhtest.dbg3 dhtest.pydbg dhtest.dbg.empty dhtest.versionoverride dhtest.customdbgsym dh7test dh7test.disabledbinary cdbstest manualtest" +TESTSOURCES="dhtest dhtest.doublestrip dhtest.samename dhtest.substvars dhtest.whitespace dhtest.nostrip dhtest.noargs dhtest.archspecific dhtest.tmpdirarg dhtest.dbg dhtest.dbg.buildid dhtest.dbg2 dhtest.dbg3 dhtest.pydbg dhtest.dbg.empty dhtest.versionoverride dhtest.customdbgsym dh7test dh7test.disabledbinary cdbstest manualtest" print_result() { if [ -n "$fail" ]; then @@ -79,8 +79,6 @@ check_command "env -u NO_PKG_MANGLE PATH=$ROOTDIR:$PATH PKG_IGNORE_CURRENTLY_BUILDING=1 fakeroot dpkg-buildpackage -us -uc -b" "Building source package $s" # clean it check_command "fakeroot debian/rules clean" "Cleaning source package $s" - # debhelper compat 1 leaves debhelper.log behind, work around - rm -f debian/debhelper.log SRCVERSION=`dpkg-parsechangelog -SVersion` cd .. # check for leftovers