X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/31efb9e8e894932ce88218c9aebfd4048d81658c..6407057398e86db934188e7527a21f09cce4e96b:/debian/rules

diff --git a/debian/rules b/debian/rules
index 0787c0c8b..2007370c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,9 +17,6 @@
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-# apt can be build from the same source on debian and ubuntu
-DIST = $(shell lsb_release -i -s)
-
 # FOR AUTOCONF 2.52 AND NEWER ONLY
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   confflags += --build $(DEB_HOST_GNU_TYPE)
@@ -39,6 +36,7 @@ endif
 # Default rule
 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')
 APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)
@@ -114,7 +112,7 @@ build/configure-stamp: configure
 	cd build && CXXFLAGS="$(confcxxflags)" ../configure $(confflags)
 	touch $@
 
-build/build-stamp: build/configure-stamp patch
+build/build-stamp: build/configure-stamp
 	# Add here commands to compile the package.
 	$(MAKE) binary
 	touch $@
@@ -124,7 +122,7 @@ build/build-doc-stamp: build/configure-stamp
 	$(MAKE) doc
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 #	dh_testroot
 	-$(MAKE) clean
@@ -212,10 +210,15 @@ apt: build debian/shlibs.local
 
 	cp debian/bugscript debian/$@/usr/share/bug/apt/script
 
-	cp share/debian-archive.gpg debian/$@/usr/share/$@
-
+	cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
+	cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu
 #	head -n 500 ChangeLog > debian/ChangeLog
 
+	# 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
+
 	dh_installexamples -p$@ $(BLD)/docs/examples/*
 	dh_installman -p$@ 
 	dh_installcron -p$@
@@ -272,6 +275,7 @@ 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..
 	dh_installman -p$@
@@ -334,20 +338,9 @@ cvs-mkul:
 	-mkdir -p ../upload-$(APT_DEBVER)
 	cp `find debian/cvs-build -maxdepth 1 -type f` ../upload-$(APT_DEBVER)
 
-patch: patch-stamp
-patch-stamp:
-	cp debian/patches/00list.$(DIST) debian/patches/00list
-	dpatch apply-all
-	touch patch-stamp
-
-unpatch:
-	cp debian/patches/00list.$(DIST) debian/patches/00list
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-
 arch-build:
 	rm -rf debian/arch-build
 	mkdir -p debian/arch-build/apt-$(APT_DEBVER)
-	baz inventory -s | xargs cp -a --parents --target=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))
+	(cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes)