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

diff --git a/debian/apt.postinst b/debian/apt.postinst
index ae1801198a79174e15b6e952b67d76091bc191a2..df0433057f1dba4c0c87737214f2ab75a570c9ac 100644 (file)
--- 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 bd9073ad28e6e3e3db56b2eda355ec88996037d4..4d88d5b12d446e09c8c928a46eb28ec0e08c6c5e 100755 (executable)
--- 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 45e5b1e5abfdd21d63a6c6d2a44b44376f5a4476..07dc51c075f99fe09b7b5c86dcc77cb2bc79406a 100644 (file)
--- 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=$@