From 34a15f72ffcab2445332c72e3c0b030f0595b56f Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 25 Jan 2006 12:44:39 +0100
Subject: * DistUpgrade/build-tarball.sh:   - create a tarbal for the
 dist-upgrade tool   - include the current set of translations *
 DistUpgrade/DistUpgradeViewGtk.py:   - look for i18n files in "mo/" *
 po/POTFILES.in:   - include the dist-upgrade stuff as well * po/*.po: make
 update-po

---
 DistUpgrade/DistUpgradeCache.py   |  1 +
 DistUpgrade/DistUpgradeViewGtk.py |  4 +++-
 DistUpgrade/build-tarball.sh      | 22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100755 DistUpgrade/build-tarball.sh

(limited to 'DistUpgrade')

diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py
index 7629ed64..c7cb89f3 100644
--- a/DistUpgrade/DistUpgradeCache.py
+++ b/DistUpgrade/DistUpgradeCache.py
@@ -122,6 +122,7 @@ class MyCache(apt.Cache):
             if not trusted:
                 untrusted.append(pkg.name)
         if len(untrusted) > 0:
+            untrusted.sort()
             logging.error("Unauthenticated packages found: '%s'" % \
                           " ".join(untrusted))
             # FIXME: maybe ask a question here? instead of failing?
diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 0cbc22be..ee05a5bf 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -35,7 +35,7 @@ import os
 
 from apt.progress import InstallProgress
 from DistUpgradeView import DistUpgradeView
-from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp
+from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp, bindtextdomain
 
 from gettext import gettext as _
 
@@ -182,6 +182,8 @@ class GtkDistUpgradeView(DistUpgradeView,SimpleGladeApp):
     
     def __init__(self):
         # FIXME: i18n must be somewhere relative do this dir
+        bindtextdomain("update-manager",os.path.join(os.getcwd(),"mo"))
+
         SimpleGladeApp.__init__(self, "DistUpgrade.glade",
                                 None, domain="update-manager")
         self.window_main.set_keep_above(True)
diff --git a/DistUpgrade/build-tarball.sh b/DistUpgrade/build-tarball.sh
new file mode 100755
index 00000000..57185c34
--- /dev/null
+++ b/DistUpgrade/build-tarball.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+DIST=dapper
+
+# cleanup
+rm -f *~ *.bak *.pyc
+
+# update po
+(cd ../po; make update-po)
+
+# copy the mo files
+cp -r ../po/mo .
+
+# make symlink
+if [ ! -h $DIST ]; then
+	ln -s dist-upgrade.py $DIST
+fi
+
+# create the tarbal 
+tar -c -z -v --exclude=$DIST.tar.gz --exclude=$0 -f $DIST.tar.gz .
+
+
-- 
cgit v1.2.3