From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 28 Mar 2006 19:02:47 +0000 (+0200)
Subject: * merged with mainline
X-Git-Tag: 0.7.24ubuntu1~261
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/29bbe08e95d7ab3c5910b7e588c7903de7921ca3?ds=inline;hp=-c

* merged with mainline
---

29bbe08e95d7ab3c5910b7e588c7903de7921ca3
diff --combined configure.in
index ad22d01c0,8d4b99904..2e92bd0a9
--- a/configure.in
+++ b/configure.in
@@@ -18,7 -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.6.43.2ubuntu2")
 -AC_DEFINE_UNQUOTED(VERSION,"0.6.43.3")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.43.3ubuntu1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
diff --combined debian/rules
index 92931b6f8,5647ebd23..bd9073ad2
--- a/debian/rules
+++ b/debian/rules
@@@ -214,11 -214,6 +214,11 @@@ apt: build debian/shlibs.loca
  
  #	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$@
@@@ -341,6 -336,6 +341,6 @@@ cvs-mkul
  arch-build:
  	rm -rf debian/arch-build
  	mkdir -p debian/arch-build/apt-$(APT_DEBVER)
- 	tar -c --exclude=arch-build -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(DEBVER);tar xf -)
+ 	tar -c --exclude=arch-build -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)