From 3f599bb721c4ac58d8ff18991c9704b5f30eaa2b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 6 Feb 2007 10:49:25 +0100 Subject: * apt-pkg/acquire-item.cc: - default to "/usr/lib/apt/apt-report-mirror-failure" * cmdline/apt-report-mirror-failure: - no default comit url for now * debian/rules: - move apt-report-mirror-failure into /usr/lib/apt * doc/examples/configure-index: - more documentation * methods/mirror.cc: - updated TODO --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 02ee734bb..9e87b1723 100755 --- a/debian/rules +++ b/debian/rules @@ -214,6 +214,10 @@ apt: build debian/shlibs.local # head -n 500 ChangeLog > debian/ChangeLog + # move the mirror failure script in place + mv debian/$@/usr/bin/apt-report-mirror-failure \ + debian/$@/usr/lib/apt/apt-report-mirror-failure \ + dh_installexamples -p$@ $(BLD)/docs/examples/* dh_installman -p$@ dh_installcron -p$@ -- cgit v1.2.3-70-g09d2 From cca374a232065c48d3979a9af9bf9bdaaf4664c8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 5 Sep 2007 18:43:34 +0200 Subject: debian/rules: - do not clean debian/copyright, soyuz checks for it now --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index a46169a7b..ef2e6b896 100755 --- a/debian/rules +++ b/debian/rules @@ -131,7 +131,7 @@ clean: rm -rf build # Add here commands to clean up after the build process. - dh_clean debian/copyright debian/shlibs.local debian/shlibs.local.apt debian/shlibs.local.apt-utils + dh_clean debian/shlibs.local debian/shlibs.local.apt debian/shlibs.local.apt-utils binary-indep: apt-doc libapt-pkg-doc # Build architecture-independent files here. -- cgit v1.2.3-70-g09d2 From 99a5ac4da1f64b233c3f66f32593231ce3066757 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 11 Feb 2008 14:05:12 +0100 Subject: * share/apt-auth-failure.note: - show update-notifier note if the nightly update fails with a authentication failure (apt-authentication-reliability spec) --- Makefile | 1 + debian/changelog | 8 ++++++++ debian/rules | 1 + share/apt-auth-failure.note | 11 +++++++++++ share/makefile | 12 ++++++++++++ 5 files changed, 33 insertions(+) create mode 100644 share/apt-auth-failure.note create mode 100644 share/makefile (limited to 'debian/rules') diff --git a/Makefile b/Makefile index 664caca41..8e3ed7e3c 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ all headers library clean veryclean binary program doc dirs: $(MAKE) -C apt-inst $@ $(MAKE) -C methods $@ $(MAKE) -C cmdline $@ + $(MAKE) -C share $@ $(MAKE) -C ftparchive $@ $(MAKE) -C dselect $@ $(MAKE) -C doc $@ diff --git a/debian/changelog b/debian/changelog index f1c694de2..cbe97d1cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.9ubuntu8) hardy; urgency=low + + * share/apt-auth-failure.note: + - show update-notifier note if the nightly update fails with a + authentication failure (apt-authentication-reliability spec) + + -- Michael Vogt Mon, 11 Feb 2008 14:04:56 +0100 + apt (0.7.9ubuntu7) hardy; urgency=low * methods/connect.cc: diff --git a/debian/rules b/debian/rules index 7bf99f9ef..4f6d72e06 100755 --- a/debian/rules +++ b/debian/rules @@ -214,6 +214,7 @@ apt: build debian/shlibs.local cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ + sed 's/^_//' share/apt-auth-failure.note > debian/$@/usr/share/$@/apt-auth-failure.note cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu # head -n 500 ChangeLog > debian/ChangeLog diff --git a/share/apt-auth-failure.note b/share/apt-auth-failure.note new file mode 100644 index 000000000..3e8a9e71d --- /dev/null +++ b/share/apt-auth-failure.note @@ -0,0 +1,11 @@ +_Name: Apt Authentication issue +Priority: High +Terminal: False +Command: gksu -- synaptic --non-interactive --update-at-startup --hide-main-window +GettextDomain: apt +_Description: Problem during package list update. + The package list update failed with a authentication failure. + This usually happens behind a network proxy server. Please try + to click on the "Run this action now" button to correct the problem or + update the list manually by running Update Manager and clicking + on "Check". diff --git a/share/makefile b/share/makefile new file mode 100644 index 000000000..e35376d98 --- /dev/null +++ b/share/makefile @@ -0,0 +1,12 @@ + +BASE=.. +SUBDIR=share + +# Bring in the default rules +include ../buildlib/defaults.mak + +binary: apt-auth-failure.note.h + +apt-auth-failure.note.h: apt-auth-failure.note + intltool-extract -t gettext/rfc822deb apt-auth-failure.note + echo "share/apt-auth-failure.note.h" >> $(BUILD)/po/domains/apt/apt-auth-failure.note.srclist -- cgit v1.2.3-70-g09d2 From 70371bc8163cab22dec315f73db087095a011669 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 4 May 2010 21:48:38 +0200 Subject: * debian/rules: - spell out some less known options to reduce manpage consulation-rate - Use POSIX command substitution: $() - Remove EOL whitespace (Closes: #577804) --- debian/changelog | 4 ++++ debian/rules | 69 ++++++++++++++++++++++++-------------------------------- 2 files changed, 34 insertions(+), 39 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 2a28ce314..710b0f844 100644 --- a/debian/changelog +++ b/debian/changelog @@ -70,6 +70,10 @@ apt (0.7.26~exp4) UNRELEASED; urgency=low * dselect/install: - modernize if-statements not to use 'x' (Closes: #577117) - replace backticks with POSIX $() (Closes: #577116) + * debian/rules: + - spell out some less known options to reduce manpage consulation-rate + - Use POSIX command substitution: $() + - Remove EOL whitespace (Closes: #577804) -- David Kalnischkies Sat, 03 Apr 2010 14:58:39 +0200 diff --git a/debian/rules b/debian/rules index 2fe6ed69c..ba19f2526 100755 --- a/debian/rules +++ b/debian/rules @@ -47,7 +47,7 @@ BASE=. ifdef BUILD BUILD_POSSIBLE := $(BUILD) $(BASE)/$(BUILD) else -BUILD_POSSIBLE := $(BASE) $(BASE)/build-$(shell uname -m) $(BASE)/build +BUILD_POSSIBLE := $(BASE) $(BASE)/build-$(shell uname --machine) $(BASE)/build endif BUILDX:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak*)) BUILDX:= $(patsubst %/,%,$(firstword $(dir $(BUILDX)))) @@ -82,9 +82,9 @@ LIBAPTPKG_PROVIDE=libapt-pkg$(LIBAPTPKG_MAJOR) LIBAPTINST_PROVIDE=libapt-inst$(LIBAPTINST_MAJOR) debian/shlibs.local: apt-pkg/makefile - # We have 3 shlibs.local files.. One for 'apt', one for 'apt-utils' and + # We have 3 shlibs.local files: One for 'apt', one for 'apt-utils' and # one for the rest of the packages. This ensures that each package gets - # the right overrides.. + # the right overrides… rm -rf $@ $@.apt $@.apt-utils echo "libapt-pkg $(LIBAPTPKG_MAJOR)" > $@.apt @@ -94,8 +94,8 @@ debian/shlibs.local: apt-pkg/makefile echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@ echo "libapt-inst $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@ -build: build/build-stamp -build-doc: build/build-doc-stamp +build: build/build-stamp +build-doc: build/build-doc-stamp # Note that this is unconditionally done first as part of loading environment.mak # The true is needed to force make to reload environment.mak after running @@ -123,10 +123,8 @@ build/build-doc-stamp: build/configure-stamp clean: dh_testdir -# dh_testroot - [ -f Makefile ] && $(MAKE) clean - [ -f Makefile ] && $(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) clean distclean rm -rf build # Add here commands to clean up after the build process. @@ -141,22 +139,19 @@ libapt-pkg-doc: build-doc debian/shlibs.local dh_installdirs -p$@ # # libapt-pkg-doc install -# - dh_installdocs -p$@ $(BLD)/docs/cache* $(BLD)/docs/design* $(BLD)/docs/dpkg-tech* \ - $(BLD)/docs/files* $(BLD)/docs/method* \ - doc/libapt-pkg2_to_3.txt doc/style.txt +# + dh_installdocs -p$@ $(BLD)/docs/design* \ + $(BLD)/docs/dpkg-tech* \ + $(BLD)/docs/files* \ + $(BLD)/docs/method* \ + doc/libapt-pkg2_to_3.txt \ + doc/style.txt dh_installexamples -p$@ -# dh_installmenu -p$@ -# dh_installinit -p$@ -# dh_installcron -p$@ -# dh_installman -p$@ -# dh_undocumented -p$@ dh_installchangelogs -p$@ dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ -# dh_suidregister -p$@ dh_installdeb -p$@ dh_gencontrol -p$@ -u -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) dh_md5sums -p$@ @@ -170,8 +165,10 @@ apt-doc: build-doc # apt-doc install # # Copy the guides - dh_installdocs -p$@ $(BLD)/docs/guide*.text $(BLD)/docs/guide*.html \ - $(BLD)/docs/offline*.text $(BLD)/docs/offline*.html + dh_installdocs -p$@ $(BLD)/docs/guide*.text \ + $(BLD)/docs/guide*.html \ + $(BLD)/docs/offline*.text \ + $(BLD)/docs/offline*.html dh_installchangelogs -p$@ dh_compress -p$@ dh_fixperms -p$@ @@ -214,7 +211,6 @@ apt: build build-doc debian/shlibs.local cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove -# head -n 500 ChangeLog > debian/ChangeLog # copy lintian override cp share/lintian-overrides debian/$@/usr/share/lintian/overrides/apt @@ -232,9 +228,9 @@ apt: build build-doc debian/shlibs.local dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ - dh_makeshlibs -p$@ -m$(LIBAPTPKG_MAJOR) -V '$(LIBAPTPKG_PROVIDE)' + dh_makeshlibs -p$@ --major=$(LIBAPTPKG_MAJOR) --version-info='$(LIBAPTPKG_PROVIDE)' dh_installdeb -p$@ - dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt + dh_shlibdeps -p$@ -l$(pwd)/debian/apt/usr/lib:$(pwd)/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt dh_gencontrol -p$@ -u -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) dh_md5sums -p$@ dh_builddeb -p$@ @@ -253,16 +249,11 @@ libapt-pkg-dev: build debian/shlibs.local cp $(BLD)/include/apt-pkg/*.h debian/libapt-pkg-dev/usr/include/apt-pkg/ dh_installdocs -p$@ -# dh_installmenu -p$@ -# dh_installinit -p$@ -# dh_installcron -p$@ -# dh_installman -p$@ dh_installchangelogs -p$@ dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ -# dh_suidregister -p$@ dh_installdeb -p$@ dh_gencontrol -p$@ -u -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE) dh_md5sums -p$@ @@ -290,9 +281,9 @@ apt-utils: build debian/shlibs.local dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ - dh_makeshlibs -m$(LIBAPTINST_MAJOR) -V '$(LIBAPTINST_PROVIDE)' -p$@ + dh_makeshlibs -p$@ --major=$(LIBAPTINST_MAJOR) --version-info='$(LIBAPTINST_PROVIDE)' dh_installdeb -p$@ - dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt-utils + dh_shlibdeps -p$@ -l$(pwd)/debian/apt/usr/lib:$(pwd)/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt-utils dh_gencontrol -p$@ -u -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE) dh_md5sums -p$@ dh_builddeb -p$@ @@ -304,7 +295,7 @@ apt-transport-https: build debian/shlibs.local libapt-pkg-dev dh_installdirs -p$@ # install the method - mkdir -p debian/$@/usr/lib/apt/methods + mkdir --parents debian/$@/usr/lib/apt/methods cp $(BLD)/bin/methods/https debian/$@/usr/lib/apt/methods dh_installdocs -p$@ debian/apt-transport-https.README @@ -318,7 +309,7 @@ apt-transport-https: build debian/shlibs.local libapt-pkg-dev dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ - dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib + dh_shlibdeps -p$@ -l$(pwd)/debian/apt/usr/lib:$(pwd)/debian/$@/usr/lib dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ @@ -341,7 +332,7 @@ l33ch-stamp: super-l33ch touch $@ really-clean: clean - -find -name Makefile.in -print0 | xargs -0r rm -f + -find . -name Makefile.in -print0 | xargs --null --no-run-if-empty -- rm -f find -name ChangeLog | xargs rm -f rm -f l33ch-stamp @@ -350,7 +341,7 @@ binary: binary-indep binary-arch # Done by the uploader. -#cvs update.. +#cvs update… #edit debian/changelog # configure.in has the version automatically updated now. # edit configure.in @@ -361,18 +352,18 @@ CVS_ROOT=$(shell cat CVS/Root) CVS_MODULE=$(shell cat CVS/Repository) cvs-build: rm -rf debian/cvs-build - mkdir -p debian/cvs-build + mkdir --parents debian/cvs-build (cd debian/cvs-build;cvs -d $(CVS_ROOT) export -r$(APT_CVSTAG) -d apt-$(APT_DEBVER) $(CVS_MODULE)) $(MAKE) -C debian/cvs-build/$(CVS_BUILDDIR) startup doc (cd debian/cvs-build/$(CVS_BUILDDIR);$(DEB_BUILD_PROG)) cvs-mkul: - -mkdir -p ../upload-$(APT_DEBVER) - cp `find debian/cvs-build -maxdepth 1 -type f` ../upload-$(APT_DEBVER) + -mkdir --parents ../upload-$(APT_DEBVER) + cp $(find debian/cvs-build -maxdepth 1 -type f) ../upload-$(APT_DEBVER) arch-build: rm -rf debian/arch-build - mkdir -p debian/arch-build/apt-$(APT_DEBVER) - tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -) + mkdir --parents debian/arch-build/apt-$(APT_DEBVER) + tar -c --exclude=arch-build --no-recursion -f - $(bzr inventory) | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -) $(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes) -- cgit v1.2.3-70-g09d2 From 888c49107facbed08ce58d944f317e7f5f5bbe1f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 4 May 2010 21:51:32 +0200 Subject: * debian/rules: - remove targets refering to CVS or arch as they are useless --- debian/changelog | 2 ++ debian/rules | 43 ------------------------------------------- 2 files changed, 2 insertions(+), 43 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 710b0f844..d206b1dd8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,6 +62,8 @@ apt (0.7.26~exp4) UNRELEASED; urgency=low * methods/rred.cc: - use the patchfile modification time instead of the one from the "old" file - thanks to Philipp Weis for noticing! (Closes: #571541) + * debian/rules: + - remove targets refering to CVS or arch as they are useless [ Jari Aalto ] * cmdline/apt-get.cc: diff --git a/debian/rules b/debian/rules index ba19f2526..bb2cc34c3 100755 --- a/debian/rules +++ b/debian/rules @@ -314,23 +314,9 @@ apt-transport-https: build debian/shlibs.local libapt-pkg-dev dh_md5sums -p$@ dh_builddeb -p$@ -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - -# Update from CVS -l33ch: really-clean - cvs update - buildlib/mkChangeLog - -# Update from CVS and then configure for build -super-l33ch: l33ch Makefile.in - configure: $(MAKE) configure -l33ch-stamp: super-l33ch - touch $@ - really-clean: clean -find . -name Makefile.in -print0 | xargs --null --no-run-if-empty -- rm -f find -name ChangeLog | xargs rm -f @@ -338,32 +324,3 @@ really-clean: clean binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary debian/shlibs.local - - -# Done by the uploader. -#cvs update… -#edit debian/changelog -# configure.in has the version automatically updated now. -# edit configure.in -# debian/rules cvs-build - -CVS_BUILDDIR=apt-$(APT_DEBVER) -CVS_ROOT=$(shell cat CVS/Root) -CVS_MODULE=$(shell cat CVS/Repository) -cvs-build: - rm -rf debian/cvs-build - mkdir --parents debian/cvs-build - (cd debian/cvs-build;cvs -d $(CVS_ROOT) export -r$(APT_CVSTAG) -d apt-$(APT_DEBVER) $(CVS_MODULE)) - $(MAKE) -C debian/cvs-build/$(CVS_BUILDDIR) startup doc - (cd debian/cvs-build/$(CVS_BUILDDIR);$(DEB_BUILD_PROG)) - -cvs-mkul: - -mkdir --parents ../upload-$(APT_DEBVER) - cp $(find debian/cvs-build -maxdepth 1 -type f) ../upload-$(APT_DEBVER) - -arch-build: - rm -rf debian/arch-build - mkdir --parents debian/arch-build/apt-$(APT_DEBVER) - tar -c --exclude=arch-build --no-recursion -f - $(bzr inventory) | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -) - $(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc - (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes) -- cgit v1.2.3-70-g09d2 From dc1e2a06b5dde8911b51677842c6942de37dc5b1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 6 May 2010 12:14:53 +0200 Subject: - install html doxygen in libapt-pkg-doc * debian/control: - build-depend on doxygen --- configure.in | 2 +- debian/changelog | 6 ++++-- debian/control | 2 +- debian/rules | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'debian/rules') diff --git a/configure.in b/configure.in index 82785a9dd..5e7122f33 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.25.4") +AC_DEFINE_UNQUOTED(VERSION,"0.7.26~exp4") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 65c0356f9..cffdeb486 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,7 +69,9 @@ apt (0.7.26~exp4) UNRELEASEDexperimental; urgency=low * apt-pkg/deb/debrecords.cc: - fix max tag buffer size (LP: #545336, closes: #578959) * debian/rules: - - install html doxygen in libapt-pkg-doc as well + - install html doxygen in libapt-pkg-doc + * debian/control: + - build-depend on doxygen [ Julian Andres Klode ] * apt-pkg/contrib/weakptr.h: @@ -84,7 +86,7 @@ apt (0.7.26~exp4) UNRELEASEDexperimental; urgency=low * cmdline/apt-get.cc: - Add apt-get markauto and unmarkauto commands. - -- David Kalnischkies Sat, 03 Apr 2010 14:58:39 +0200 + -- Michael Vogt Thu, 06 May 2010 09:32:54 +0200 apt (0.7.26~exp3) experimental; urgency=low diff --git a/debian/control b/debian/control index ad4ed24ec..4f41c130b 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen Build-Conflicts: autoconf2.13, automake1.4 Package: apt diff --git a/debian/rules b/debian/rules index 7677708b2..f901ea749 100755 --- a/debian/rules +++ b/debian/rules @@ -142,10 +142,10 @@ libapt-pkg-doc: build-doc debian/shlibs.local # # libapt-pkg-doc install # - dh_installdocs -p$@ $(BLD)/docs/cache* $(BLD)/docs/design* $(BLD)/docs/dpkg-tech* \ + dh_installdocs -p$@ $(BLD)/docs/design* $(BLD)/docs/dpkg-tech* \ $(BLD)/docs/files* $(BLD)/docs/method* \ doc/libapt-pkg2_to_3.txt doc/style.txt \ - $(BLD)/doc/doxygen/html/* + $(BLD)/doc/doxygen/html dh_installexamples -p$@ # dh_installmenu -p$@ # dh_installinit -p$@ -- cgit v1.2.3-70-g09d2 From a59397c121813583f5d43f70aa0a779bd0025477 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 24 May 2010 12:06:58 +0200 Subject: use $(CURDIR) instead of $(pwd) --- debian/changelog | 1 + debian/rules | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 9d197863c..6d7b62be0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low "old" file - thanks to Philipp Weis for noticing! (Closes: #571541) * debian/rules: - remove targets referring to CVS or arch as they are useless + - use $(CURDIR) instead of $(pwd) * README.arch: - remove the file completely as it has no use nowadays * apt-pkg/depcache.cc: diff --git a/debian/rules b/debian/rules index cb4622779..f1cb77fbe 100755 --- a/debian/rules +++ b/debian/rules @@ -231,7 +231,7 @@ apt: build build-doc debian/shlibs.local dh_fixperms -p$@ dh_makeshlibs -p$@ --major=$(LIBAPTPKG_MAJOR) --version-info='$(LIBAPTPKG_PROVIDE)' dh_installdeb -p$@ - dh_shlibdeps -p$@ -l$(pwd)/debian/apt/usr/lib:$(pwd)/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt + dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt dh_gencontrol -p$@ -u -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) dh_md5sums -p$@ dh_builddeb -p$@ @@ -284,7 +284,7 @@ apt-utils: build debian/shlibs.local dh_fixperms -p$@ dh_makeshlibs -p$@ --major=$(LIBAPTINST_MAJOR) --version-info='$(LIBAPTINST_PROVIDE)' dh_installdeb -p$@ - dh_shlibdeps -p$@ -l$(pwd)/debian/apt/usr/lib:$(pwd)/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt-utils + dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt-utils dh_gencontrol -p$@ -u -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE) dh_md5sums -p$@ dh_builddeb -p$@ @@ -310,7 +310,7 @@ apt-transport-https: build debian/shlibs.local libapt-pkg-dev dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ - dh_shlibdeps -p$@ -l$(pwd)/debian/apt/usr/lib:$(pwd)/debian/$@/usr/lib + dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ -- cgit v1.2.3-70-g09d2 From 39151234858bb92d2e24ab367ebc14b363b4a48c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 24 May 2010 12:09:45 +0200 Subject: use dpkg-buildflags if available for CXXFLAGS --- debian/changelog | 1 + debian/rules | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 6d7b62be0..a0adde726 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * debian/rules: - remove targets referring to CVS or arch as they are useless - use $(CURDIR) instead of $(pwd) + - use dpkg-buildflags if available for CXXFLAGS * README.arch: - remove the file completely as it has no use nowadays * apt-pkg/depcache.cc: diff --git a/debian/rules b/debian/rules index f1cb77fbe..827fc2034 100755 --- a/debian/rules +++ b/debian/rules @@ -27,10 +27,14 @@ endif # See below -include build/environment.mak -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - export CXXFLAGS = -O0 -g -Wall +ifneq (,$(shell which dpkg-buildflags)) + export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) else - export CXXFLAGS = -O2 -g -Wall + ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + export CXXFLAGS = -O0 -g -Wall + else + export CXXFLAGS = -O2 -g -Wall + endif endif # Default rule -- cgit v1.2.3-70-g09d2 From ba74b79fb5c74d916f9bfe1b314e8107a9e7eab4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Jun 2010 13:03:41 +0200 Subject: debian/rules: remove two more leftovers fromthe ubuntu merge --- debian/rules | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 4c6795910..0ac45f851 100755 --- a/debian/rules +++ b/debian/rules @@ -215,8 +215,6 @@ apt: build build-doc debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt - cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ - sed 's/^_//' share/apt-auth-failure.note > debian/$@/usr/share/$@/apt-auth-failure.note cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove # copy lintian override -- cgit v1.2.3-70-g09d2 From fdd739c74dcf266a7cb2f3688ea11afec4055f2c Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 10:01:27 +0200 Subject: * debian/rules: - Make DEB_BUILD_OPTIONS=noopt actually work by passing the right CXXFLAGS. --- debian/changelog | 3 +++ debian/rules | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index bd328fd08..483fff9c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * Italian translation update. Closes: #581742 [ Martin Pitt ] + * debian/rules: + - Make DEB_BUILD_OPTIONS=noopt actually work by passing the right + CXXFLAGS. * apt-pkg/contrib/fileutl.{h,cc}: - Add support for transparent reading of gzipped files. - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. diff --git a/debian/rules b/debian/rules index 7677708b2..450f3e0f6 100755 --- a/debian/rules +++ b/debian/rules @@ -108,7 +108,7 @@ build/configure-stamp: configure dh_testdir -mkdir build cp COPYING debian/copyright - cd build && CXXFLAGS="$(confcxxflags)" ../configure $(confflags) + cd build && CXXFLAGS="$(CXXFLAGS)" ../configure $(confflags) touch $@ build/build-stamp: build/configure-stamp -- cgit v1.2.3-70-g09d2