X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/e184b9df4e03547ea6df40285b8e3714eed9112c..9b78cda6873104b80ffdbc8b5d3965575ce0a31d:/debian/rules diff --git a/debian/rules b/debian/rules index 0b932a71e..8bfcaf385 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,7 @@ # Made with the aid of dh_make, by Craig Small # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. # Some lines taken from debmake, by Christoph Lameter. -# $Id: rules,v 1.43 2002/11/10 23:58:33 doogie Exp $ +# $Id: rules,v 1.68 2004/05/30 18:21:43 mdz Exp $ # LD_LIBRARY_PATH=pwd/debian/apt/usr/lib dh_shlibdeps -papt # dpkg: /home/jgg/work/apt2/debian/apt/usr/lib/libapt-pkg.so.2.9 not found. @@ -14,8 +14,6 @@ # create ../upload-, with all the files needed to be uploaded placed # in it. -export DH_COMPAT=2 - export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) @@ -29,19 +27,31 @@ endif # See below -include build/environment.mak +ifneq (,$(shell which dpkg-buildflags)) + export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) +else + ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + export CXXFLAGS = -O0 -g -Wall + else + export CXXFLAGS = -O2 -g -Wall + endif +endif + # Default rule build: -DEB_BUILD_PROG:=debuild -us -uc -APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p') +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_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g') # Determine the build directory to use 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)))) @@ -53,9 +63,11 @@ 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 $@.$$$$ $@ + sed -e 's/$(APT_CONFVER)/$(APT_DEBVER)/' $@ > $@.$$$$ && mv $@.$$$$ $@ +endif else configure.in: endif @@ -67,27 +79,27 @@ APT_UTILS=ftparchive sortpkgs extracttemplates #export DH_VERBOSE=1 # Find the libapt-pkg major version for use in other control files -export LIBAPTPKG_MAJOR:=$(shell egrep '^MAJOR=' apt-pkg/makefile |cut -d '=' -f 2) -export LIBAPTINST_MAJOR:=$(shell egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2) +include buildlib/libversion.mak # Determine which package we should provide in the control files -LIBAPTPKG_PROVIDE=libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTPKG_MAJOR) -LIBAPTINST_PROVIDE=libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTINST_MAJOR) +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$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR)" > $@.apt + echo "libapt-pkg $(LIBAPTPKG_MAJOR)" > $@.apt - echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils - echo "libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTINST_MAJOR)" >> $@.apt-utils + echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils + echo "libapt-inst $(LIBAPTINST_MAJOR)" >> $@.apt-utils - echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@ - echo "libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@ + echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@ + echo "libapt-inst $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@ -build: build/build-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 @@ -100,72 +112,83 @@ build/configure-stamp: configure dh_testdir -mkdir build cp COPYING debian/copyright -ifneq ($(wildcard /usr/share/misc/config.sub),) - cp -a /usr/share/misc/config.sub buildlib/config.sub - echo Updating buildlib/config.sub -endif -ifneq ($(wildcard /usr/share/misc/config.guess),) - cp -a /usr/share/misc/config.guess buildlib/config.guess - echo Updating buildlib/config.guess -endif - cd build && ../configure $(confflags) + cd build && CXXFLAGS="$(CXXFLAGS)" ../configure $(confflags) touch $@ build/build-stamp: build/configure-stamp # Add here commands to compile the package. - $(MAKE) -s + $(MAKE) binary + touch $@ + +build/build-doc-stamp: build/configure-stamp + # Add here commands to compile the package. + $(MAKE) doc touch $@ clean: dh_testdir -# dh_testroot - -$(MAKE) clean - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) clean distclean 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 -binary-indep: libapt-pkg-doc +binary-indep: apt-doc libapt-pkg-doc # Build architecture-independent files here. -libapt-pkg-doc: build debian/shlibs.local +libapt-pkg-doc: build-doc debian/shlibs.local dh_testdir -p$@ dh_testroot -p$@ dh_clean -p$@ -k 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 - - -cp -a debian/libapt-pkg-doc.dhelp debian/libapt-pkg-doc/usr/doc/libapt-pkg-doc/.dhelp - -cp -a debian/libapt-pkg-doc.dhelp debian/libapt-pkg-doc/usr/share/doc/libapt-pkg-doc/.dhelp - +# + 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 dh_installexamples -p$@ -# dh_installmenu -p$@ -# dh_installinit -p$@ -# dh_installcron -p$@ -# dh_installmanpages -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$@ dh_builddeb -p$@ +apt-doc: build-doc + dh_testdir -p$@ + dh_testroot -p$@ + dh_clean -p$@ -k +# +# 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_installchangelogs -p$@ + dh_compress -p$@ + dh_fixperms -p$@ + dh_installdeb -p$@ + dh_gencontrol -p$@ + dh_md5sums -p$@ + dh_builddeb -p$@ + + # Build architecture-dependent files here. -binary-arch: apt libapt-pkg-dev apt-utils -apt: build debian/shlibs.local +binary-arch: 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 debian/shlibs.local dh_testdir -p$@ dh_testroot -p$@ dh_clean -p$@ -k @@ -173,41 +196,51 @@ apt: build debian/shlibs.local # # apt install # - cp $(BLD)/bin/apt-* debian/apt/usr/bin/ + cp $(BLD)/bin/apt-* debian/$@/usr/bin/ # Remove the bits that are in apt-utils - rm $(addprefix debian/apt/usr/bin/apt-,$(APT_UTILS)) + rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS)) # install the shared libs - find $(BLD)/bin/ -type f -name "libapt-pkg*.so.*" -exec cp -a "{}" debian/apt/usr/lib/ \; - find $(BLD)/bin/ -type l -name "libapt-pkg*.so.*" -exec cp -a "{}" debian/apt/usr/lib/ \; + find $(BLD)/bin/ -type f -name "libapt-pkg*.so.*" -exec cp -a "{}" debian/$@/usr/lib/ \; + find $(BLD)/bin/ -type l -name "libapt-pkg*.so.*" -exec cp -a "{}" debian/$@/usr/lib/ \; - cp $(BLD)/bin/methods/* debian/apt/usr/lib/apt/methods/ + cp $(BLD)/bin/methods/* debian/$@/usr/lib/apt/methods/ + # https has its own package + rm debian/$@/usr/lib/apt/methods/https - cp $(BLD)/scripts/dselect/* debian/apt/usr/lib/dpkg/methods/apt/ - cp -r $(BLD)/locale debian/apt/usr/ + cp $(BLD)/scripts/dselect/* debian/$@/usr/lib/dpkg/methods/apt/ + cp -r $(BLD)/locale debian/$@/usr/share/ - # Copy the guides - dh_installdocs -p$@ $(BLD)/docs/guide*.text $(BLD)/docs/guide*.html \ - $(BLD)/docs/offline.text $(BLD)/docs/offline.html + cp debian/bugscript debian/$@/usr/share/bug/apt/script + cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt - # One or the other.. - -cp -a debian/dhelp debian/apt/usr/doc/apt/.dhelp - -cp -a debian/dhelp debian/apt/usr/share/doc/apt/.dhelp + 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 - dh_installexamples -p$@ $(BLD)/docs/examples/* - dh_installmanpages -p$@ apt-ftparchive.1 apt-sortpkgs.1 apt-extracttemplates.1 + # make rosetta happy and remove pot files in po/ (but leave stuff + # in po/domains/* untouched) and cp *.po into each domain dir + rm -f build/po/*.pot + rm -f po/*.pot + + # 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$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES))) + dh_installcron -p$@ + dh_installdocs -p$@ dh_installchangelogs -p$@ dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ + dh_makeshlibs -p$@ --major=$(LIBAPTPKG_MAJOR) --version-info='$(LIBAPTPKG_PROVIDE)' dh_installdeb -p$@ - dh_shlibdeps -papt -l`pwd`/debian/apt/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_makeshlibs -m$(LIBAPTPKG_MAJOR) -V '$(LIBAPTPKG_PROVIDE)' -papt dh_md5sums -p$@ dh_builddeb -p$@ @@ -225,21 +258,17 @@ 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_installmanpages -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_gencontrol -p$@ -u -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE) dh_md5sums -p$@ dh_builddeb -p$@ +apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates apt-utils: build debian/shlibs.local dh_testdir -p$@ dh_testroot -p$@ @@ -252,64 +281,55 @@ apt-utils: build debian/shlibs.local cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/ dh_installdocs -p$@ + dh_installexamples -p$@ # Install the man pages.. - mkdir -p debian/$@/usr/share/man/man1 - -cp doc/apt-sortpkgs.1 doc/apt-ftparchive.1 doc/apt-extracttemplates.1 debian/$@/usr/share/man/man1/ + dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES))) dh_installchangelogs -p$@ dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ + dh_makeshlibs -p$@ --major=$(LIBAPTINST_MAJOR) --version-info='$(LIBAPTINST_PROVIDE)' dh_installdeb -p$@ - LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib dh_shlibdeps -p$@ -- -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_makeshlibs -m$(LIBAPTINST_MAJOR) -V '$(LIBAPTINST_PROVIDE)' -p$@ dh_md5sums -p$@ dh_builddeb -p$@ -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false +apt-transport-https: build debian/shlibs.local libapt-pkg-dev + dh_testdir -p$@ + dh_testroot -p$@ + dh_clean -p$@ -k + dh_installdirs -p$@ + + # install the method + mkdir --parents debian/$@/usr/lib/apt/methods + cp $(BLD)/bin/methods/https debian/$@/usr/lib/apt/methods -# Update from CVS -l33ch: really-clean - cvs update - buildlib/mkChangeLog + dh_installdocs -p$@ debian/apt-transport-https.README + dh_installexamples -p$@ + + # Install the man pages.. + dh_installman -p$@ -# Update from CVS and then configure for build -super-l33ch: l33ch Makefile.in + dh_installchangelogs -p$@ + dh_strip -p$@ + dh_compress -p$@ + dh_fixperms -p$@ + dh_installdeb -p$@ + dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib + dh_gencontrol -p$@ + dh_md5sums -p$@ + dh_builddeb -p$@ configure: $(MAKE) configure -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 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-build: - rm -rf debian/cvs-build - cvs update - $(MAKE) startup - $(MAKE) doc - tar c --exclude CVS --exclude cvs-build . |\ - (mkdir -p debian/cvs-build/apt-$(APT_DEBVER);cd debian/cvs-build/apt-$(APT_DEBVER);tar x) - (cd debian/cvs-build/apt-$(APT_DEBVER);$(DEB_BUILD_PROG)) - -cvs-mkul: - -mkdir -p ../upload-$(APT_DEBVER) - cp `find debian/cvs-build -maxdepth 1 -type f` ../upload-$(APT_DEBVER)