From ff859c7f94e7ba2b698208d3db43a2b3bdbbb736 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 3 May 2011 14:15:52 +0200 Subject: ship the apt-internal-solver in apt-utils package and link it to /usr/lib/apt/solvers so we have it available for playing as 'apt' --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 640900678..c8aefee63 100755 --- a/debian/rules +++ b/debian/rules @@ -62,7 +62,7 @@ configure.in: endif # APT Programs in apt-utils -APT_UTILS=ftparchive sortpkgs extracttemplates +APT_UTILS=ftparchive sortpkgs extracttemplates internal-solver # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -- cgit v1.2.3 From 7f4713547665e12e032501228a98586e5add48f7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 3 May 2011 17:27:11 +0200 Subject: add a tiny dump solver to quickly output a scenario --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index c8aefee63..77a7b4fdb 100755 --- a/debian/rules +++ b/debian/rules @@ -182,7 +182,7 @@ apt: build build-doc dh_install -p$@ --sourcedir=$(BLD) # Remove the bits that are in apt-utils - rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS)) + rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS) dump-solver) # https has its own package rm debian/$@/usr/lib/apt/methods/https -- cgit v1.2.3 From 66b6fe055a0604d2a8372e61032e492f88f49f86 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 9 May 2011 21:55:32 +0200 Subject: fix package building so 'dump' is a binary not a directory --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 77a7b4fdb..c83796e03 100755 --- a/debian/rules +++ b/debian/rules @@ -236,8 +236,10 @@ apt-utils: build dh_installdirs -p$@ cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/ + cp $(BLD)/bin/apt-dump-solver debian/$@/usr/lib/apt/solvers/dump dh_install -p$@ --sourcedir=$(BLD) + dh_link -p$@ dh_installdocs -p$@ dh_installexamples -p$@ -- cgit v1.2.3 From 782486e8219705249d9096c79638bd85b930522d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Jun 2011 17:12:32 +0200 Subject: initial librarification push --- debian/rules | 52 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 11 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 0544b2b8e..24fb3b9be 100755 --- a/debian/rules +++ b/debian/rules @@ -70,10 +70,6 @@ APT_UTILS=ftparchive sortpkgs extracttemplates # Find the libapt-pkg major version for use in other control files include buildlib/libversion.mak -# Determine which package we should provide in the control files -LIBAPTPKG_PROVIDE=libapt-pkg$(LIBAPTPKG_MAJOR) -LIBAPTINST_PROVIDE=libapt-inst$(LIBAPTINST_MAJOR) - # do not fail as we are just experimenting with symbol files for now export DPKG_GENSYMBOLS_CHECK_LEVEL=0 @@ -137,7 +133,7 @@ libapt-pkg-doc: build-doc dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ - dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) + dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ @@ -165,7 +161,7 @@ apt-doc: build-doc # Build architecture-dependent files here. -binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https +binary-arch: libapt-pkg4.10 libapt-inst1.2 apt libapt-pkg-dev apt-utils apt-transport-https apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list apt: build build-doc dh_testdir -p$@ @@ -207,8 +203,8 @@ apt: build build-doc dh_fixperms -p$@ dh_makeshlibs -p$@ dh_installdeb -p$@ - dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib - dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) + dh_shlibdeps -p$@ -l$(CURDIR)/debian/libapt-inst2.1/usr/lib:$(CURDIR)/debian/libapt-pkg4.10/usr/lib + dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ @@ -227,7 +223,7 @@ libapt-pkg-dev: build dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ - dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE) + dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ @@ -253,8 +249,42 @@ apt-utils: build dh_fixperms -p$@ dh_makeshlibs -p$@ dh_installdeb -p$@ - dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib - dh_gencontrol -p$@ -- -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE) + dh_shlibdeps -p$@ -l$(CURDIR)/debian/libapt-inst2.1/usr/lib:$(CURDIR)/debian/libapt-pkg4.10/usr/lib + dh_gencontrol -p$@ + dh_md5sums -p$@ + dh_builddeb -p$@ + +libapt-pkg4.10: build + dh_testdir -p$@ + dh_testroot -p$@ + dh_prep -p$@ + dh_installdirs -p$@ + + dh_install -p$@ --sourcedir=$(BLD) + dh_installchangelogs -p$@ + dh_strip -p$@ + dh_compress -p$@ + dh_fixperms -p$@ + dh_installdeb -p$@ + dh_shlibdeps -p$@ + dh_gencontrol -p$@ + dh_md5sums -p$@ + dh_builddeb -p$@ + +libapt-inst1.2: build + dh_testdir -p$@ + dh_testroot -p$@ + dh_prep -p$@ + dh_installdirs -p$@ + + dh_install -p$@ --sourcedir=$(BLD) + dh_installchangelogs -p$@ + dh_strip -p$@ + dh_compress -p$@ + dh_fixperms -p$@ + dh_installdeb -p$@ + dh_shlibdeps -p$@ -l$(CURDIR)/debian/libapt-pkg4.10/usr/lib + dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ -- cgit v1.2.3 From f521559b96d303970f50daa2f9d64c6651861d7e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Jun 2011 17:38:55 +0200 Subject: do not include libapt-pkg* in apt itself, add missing dh_makeshlibs calls --- debian/rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 24fb3b9be..a466fbf8f 100755 --- a/debian/rules +++ b/debian/rules @@ -201,7 +201,6 @@ apt: build build-doc dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ - dh_makeshlibs -p$@ dh_installdeb -p$@ dh_shlibdeps -p$@ -l$(CURDIR)/debian/libapt-inst2.1/usr/lib:$(CURDIR)/debian/libapt-pkg4.10/usr/lib dh_gencontrol -p$@ @@ -266,6 +265,7 @@ libapt-pkg4.10: build dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ + dh_makeshlibs -p$@ dh_shlibdeps -p$@ dh_gencontrol -p$@ dh_md5sums -p$@ @@ -283,6 +283,7 @@ libapt-inst1.2: build dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ + dh_makeshlibs -p$@ dh_shlibdeps -p$@ -l$(CURDIR)/debian/libapt-pkg4.10/usr/lib dh_gencontrol -p$@ dh_md5sums -p$@ -- cgit v1.2.3 From bd5e34e8cf0673248a3ab386c25b062247f10370 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Jun 2011 17:59:07 +0200 Subject: remove -l from dh_shlibdeps, that is no longer needed with recent shlibdeps --- debian/rules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index a466fbf8f..7405f8601 100755 --- a/debian/rules +++ b/debian/rules @@ -202,7 +202,7 @@ apt: build build-doc dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ - dh_shlibdeps -p$@ -l$(CURDIR)/debian/libapt-inst2.1/usr/lib:$(CURDIR)/debian/libapt-pkg4.10/usr/lib + dh_shlibdeps -p$@ dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ @@ -248,7 +248,7 @@ apt-utils: build dh_fixperms -p$@ dh_makeshlibs -p$@ dh_installdeb -p$@ - dh_shlibdeps -p$@ -l$(CURDIR)/debian/libapt-inst2.1/usr/lib:$(CURDIR)/debian/libapt-pkg4.10/usr/lib + dh_shlibdeps -p$@ dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ @@ -284,7 +284,7 @@ libapt-inst1.2: build dh_fixperms -p$@ dh_installdeb -p$@ dh_makeshlibs -p$@ - dh_shlibdeps -p$@ -l$(CURDIR)/debian/libapt-pkg4.10/usr/lib + dh_shlibdeps -p$@ dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ @@ -307,7 +307,7 @@ apt-transport-https: build libapt-pkg-dev dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ - dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib + dh_shlibdeps -p$@ dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ -- cgit v1.2.3 From 08c9b19106097fda61ab2df703c68a65131277a2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Jun 2011 18:18:06 +0200 Subject: fix lintian issues --- debian/rules | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 7405f8601..e67f17237 100755 --- a/debian/rules +++ b/debian/rules @@ -260,12 +260,13 @@ libapt-pkg4.10: build dh_installdirs -p$@ dh_install -p$@ --sourcedir=$(BLD) + dh_installdocs -p$@ dh_installchangelogs -p$@ dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ - dh_installdeb -p$@ dh_makeshlibs -p$@ + dh_installdeb -p$@ dh_shlibdeps -p$@ dh_gencontrol -p$@ dh_md5sums -p$@ @@ -278,12 +279,13 @@ libapt-inst1.2: build dh_installdirs -p$@ dh_install -p$@ --sourcedir=$(BLD) + dh_installdocs -p$@ dh_installchangelogs -p$@ dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ - dh_installdeb -p$@ dh_makeshlibs -p$@ + dh_installdeb -p$@ dh_shlibdeps -p$@ dh_gencontrol -p$@ dh_md5sums -p$@ -- cgit v1.2.3 From 7eee083af5c4121ca74f3bbed23f04d3ca20d342 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 9 Jun 2011 14:46:31 +0200 Subject: do not hardcode the libnames --- debian/rules | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index e67f17237..fd894b73b 100755 --- a/debian/rules +++ b/debian/rules @@ -70,6 +70,10 @@ APT_UTILS=ftparchive sortpkgs extracttemplates # Find the libapt-pkg major version for use in other control files include buildlib/libversion.mak +# Determine which library package names to use +LIBAPT_PKG=libapt-pkg$(LIBAPTPKG_MAJOR) +LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR) + # do not fail as we are just experimenting with symbol files for now export DPKG_GENSYMBOLS_CHECK_LEVEL=0 @@ -161,7 +165,7 @@ apt-doc: build-doc # Build architecture-dependent files here. -binary-arch: libapt-pkg4.10 libapt-inst1.2 apt libapt-pkg-dev apt-utils apt-transport-https +binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list apt: build build-doc dh_testdir -p$@ @@ -253,7 +257,7 @@ apt-utils: build dh_md5sums -p$@ dh_builddeb -p$@ -libapt-pkg4.10: build +$(LIBAPT_PKG): build dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -272,7 +276,7 @@ libapt-pkg4.10: build dh_md5sums -p$@ dh_builddeb -p$@ -libapt-inst1.2: build +$(LIBAPT_INST): build dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ -- cgit v1.2.3 From 84736cfa351ec734f13cc0016f61108c81dc67e3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 10 Jun 2011 14:43:06 +0200 Subject: include mo files in the right packages --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index fd894b73b..22eb82ca4 100755 --- a/debian/rules +++ b/debian/rules @@ -97,6 +97,10 @@ build/configure-stamp: configure build/build-stamp: build/configure-stamp # Add here commands to compile the package. $(MAKE) binary + # compat symlink for the locale split + mkdir -p build/usr/share + cd build/usr/share && ln -f -s ../../locale . + # done here touch $@ build/build-doc-stamp: build/configure-stamp -- cgit v1.2.3 From 2cc4999b21d6a4db4e6e08fd3bb760b6030d38cc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 10 Jun 2011 14:48:57 +0200 Subject: generate debiandencies for libapt-pkg-dev automatically via deb-substvars --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 22eb82ca4..c55435315 100755 --- a/debian/rules +++ b/debian/rules @@ -230,7 +230,7 @@ libapt-pkg-dev: build dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ - dh_gencontrol -p$@ + dh_gencontrol -p$@ -Vlibapt-pkg-name=$(LIBAPT_PKG) -Vlibapt-inst-name=$(LIBAPT_INST) dh_md5sums -p$@ dh_builddeb -p$@ -- cgit v1.2.3 From ceab242d7547968fa358b5c549207be209c381ef Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 10 Jun 2011 15:28:39 +0200 Subject: debian/rules: use substvars properly --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index c55435315..b6f45a38e 100755 --- a/debian/rules +++ b/debian/rules @@ -230,7 +230,7 @@ libapt-pkg-dev: build dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ - dh_gencontrol -p$@ -Vlibapt-pkg-name=$(LIBAPT_PKG) -Vlibapt-inst-name=$(LIBAPT_INST) + dh_gencontrol -p$@ -- -Vlibapt-pkg-name=$(LIBAPT_PKG) -Vlibapt-inst-name=$(LIBAPT_INST) dh_md5sums -p$@ dh_builddeb -p$@ -- cgit v1.2.3 From cb1a690cbab6d83b0301f65761d9c49d682dc678 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2011 10:41:25 +0100 Subject: merged libapt multiarch enable patch from Colin Watson, many thanks! --- debian/rules | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 30474c06b..6a5c95d22 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) # FOR AUTOCONF 2.52 AND NEWER ONLY ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) @@ -118,9 +119,31 @@ clean: [ ! -f Makefile ] || $(MAKE) clean distclean rm -rf build + rm -f debian/$(LIBAPT_PKG).install debian/$(LIBAPT_INST).install \ + debian/libapt-pkg-dev.install -binary-indep: apt-doc libapt-pkg-doc +debian/%.install: debian/%.install.in + sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ + +binary-indep: libapt-common apt-doc libapt-pkg-doc # Build architecture-independent files here. +libapt-common: build + dh_testdir -p$@ + dh_testroot -p$@ + dh_prep -p$@ + dh_installdirs -p$@ + + dh_install -p$@ --sourcedir=$(BLD) + dh_installdocs -p$@ + dh_installchangelogs -p$@ + dh_strip -p$@ + dh_compress -p$@ + dh_fixperms -p$@ + dh_installdeb -p$@ + dh_gencontrol -p$@ + dh_md5sums -p$@ + dh_builddeb -p$@ + libapt-pkg-doc: build-doc dh_testdir -p$@ dh_testroot -p$@ @@ -217,7 +240,7 @@ apt: build build-doc dh_md5sums -p$@ dh_builddeb -p$@ -libapt-pkg-dev: build +libapt-pkg-dev: build debian/libapt-pkg-dev.install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -265,7 +288,7 @@ apt-utils: build dh_md5sums -p$@ dh_builddeb -p$@ -$(LIBAPT_PKG): build +$(LIBAPT_PKG): build debian/$(LIBAPT_PKG).install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -284,7 +307,7 @@ $(LIBAPT_PKG): build dh_md5sums -p$@ dh_builddeb -p$@ -$(LIBAPT_INST): build +$(LIBAPT_INST): build debian/$(LIBAPT_INST).install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ -- cgit v1.2.3 From 386566e36bedb453eb6f914e8e14fd555a2bf111 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 28 Nov 2011 12:07:55 +0100 Subject: revert libapt-common addition because of http://lists.debian.org/debian-devel/2011/11/msg00742.html --- debian/rules | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 6a5c95d22..4ef5bb47a 100755 --- a/debian/rules +++ b/debian/rules @@ -125,25 +125,8 @@ clean: debian/%.install: debian/%.install.in sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ -binary-indep: libapt-common apt-doc libapt-pkg-doc +binary-indep: apt-doc libapt-pkg-doc # Build architecture-independent files here. -libapt-common: build - dh_testdir -p$@ - dh_testroot -p$@ - dh_prep -p$@ - dh_installdirs -p$@ - - dh_install -p$@ --sourcedir=$(BLD) - dh_installdocs -p$@ - dh_installchangelogs -p$@ - dh_strip -p$@ - dh_compress -p$@ - dh_fixperms -p$@ - dh_installdeb -p$@ - dh_gencontrol -p$@ - dh_md5sums -p$@ - dh_builddeb -p$@ - libapt-pkg-doc: build-doc dh_testdir -p$@ dh_testroot -p$@ -- cgit v1.2.3 From e537945222090f00f2811b0fa1a0a3a5b3d7d3f8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 19 Jan 2012 23:20:45 +0100 Subject: * debian/rules: - apply patch to enable usage of hardning CPPFLAGS and LDFLAGS by Moritz Muehlenhoff, thanks! (Closes: #653504) --- debian/rules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 4ef5bb47a..9eda3a8fa 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,8 @@ endif ifneq (,$(shell which dpkg-buildflags)) export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) + export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) + export CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) else ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) export CXXFLAGS = -O0 -g -Wall @@ -92,7 +94,7 @@ build/configure-stamp: configure dh_testdir -mkdir build cp COPYING debian/copyright - cd build && CXXFLAGS="$(CXXFLAGS)" ../configure $(confflags) + cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags) touch $@ build/build-stamp: build/configure-stamp -- cgit v1.2.3 From 9179f697ed4796a86f820b516f034fd679e48be4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 22 Mar 2012 00:16:11 +0100 Subject: the previously used VERSION didn't work everywhere so we are switching to the more standard PACKAGE_VERSION and make it work in every file --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 9eda3a8fa..00e6bd4b7 100755 --- a/debian/rules +++ b/debian/rules @@ -35,7 +35,7 @@ build: PKG=apt DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS) APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' | sed -e 's/\+.*$$//') -APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in) +APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"\(.*\)")/\1/p' configure.in) APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g') # Determine the build directory to use -- cgit v1.2.3 From 6d2500e267ce42fadaf301791ee0b6bc351bb176 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 22 Mar 2012 00:59:51 +0100 Subject: use the correct line to get the currently configure.in version --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 00e6bd4b7..b819460c1 100755 --- a/debian/rules +++ b/debian/rules @@ -35,7 +35,7 @@ build: PKG=apt DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS) APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' | sed -e 's/\+.*$$//') -APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"\(.*\)")/\1/p' configure.in) +APT_CONFVER=$(shell sed -n -e 's/^PACKAGE_VERSION="\(.*\)"/\1/p' configure.in) APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g') # Determine the build directory to use -- cgit v1.2.3 From 3a496cd2c06bf00d8386ff9c56e2fd26eb61ec5a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 22 Mar 2012 19:29:53 +0100 Subject: * debian/rules: - do not sed in configure.in to set the version-number * prepare-release: - add as a small script to lazy check and prepare releases --- debian/rules | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index b819460c1..4b9510663 100755 --- a/debian/rules +++ b/debian/rules @@ -34,9 +34,6 @@ build: PKG=apt DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS) -APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' | sed -e 's/\+.*$$//') -APT_CONFVER=$(shell sed -n -e 's/^PACKAGE_VERSION="\(.*\)"/\1/p' configure.in) -APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g') # Determine the build directory to use BASE=. @@ -53,17 +50,6 @@ ifeq ($(words $(BLD)),0) override BLD := ./build endif -# Rebuild configure.in to have the correct version from the change log -ifneq ($(APT_DEBVER),$(APT_CONFVER)) -ifneq ($(APT_DEBVER),) -.PHONY: configure.in -configure.in: - sed -e 's/$(APT_CONFVER)/$(APT_DEBVER)/' $@ > $@.$$$$ && mv $@.$$$$ $@ -endif -else -configure.in: -endif - # APT Programs in apt-utils APT_UTILS=ftparchive sortpkgs extracttemplates internal-solver -- cgit v1.2.3