From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 28 Mar 2006 19:43:03 +0000 (+0200)
Subject: * undo some of the bzr merge damage from the last merge
X-Git-Tag: 0.7.24ubuntu1~259
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/2913337f8e15ec33e1637a7b7b46c9c11b80d247?hp=c6c31f6206dbb8900883d2547f6ff0657113a319

* undo some of the bzr merge damage from the last merge
---

diff --git a/debian/apt.postinst b/debian/apt.postinst
index ae1801198..df0433057 100644
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -17,7 +17,7 @@ case "$1" in
     configure)
 
         if ! test -f /etc/apt/trusted.gpg; then
-                cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg
+                cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg
         fi
 
     ;;
diff --git a/debian/rules b/debian/rules
index bd9073ad2..4d88d5b12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -210,7 +210,7 @@ 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/$@
 
 #	head -n 500 ChangeLog > debian/ChangeLog
 
diff --git a/po/makefile b/po/makefile
index 45e5b1e5a..07dc51c07 100644
--- a/po/makefile
+++ b/po/makefile
@@ -40,6 +40,9 @@ $(POTFILES) : $(PO)/%.pot :
 	  --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot
 	rm -f $(PO)/POTFILES_$*.in
 	$(MSGCOMM) --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@
+	# copy into the domain dirs to make rosetta happy
+	rm -f $(PO)/domains/$*/*.pot
+	cp $@ $(PO)/domains/$*
 
 $(PACKAGE)-all.pot: $(POTFILES)
 	$(MSGCOMM) --more-than=0 $(POTFILES) --output=$@