* missing fixes

* make update-po

22 files changed, 52 insertions, 53 deletions

diff --git a/SoftwareProperties/__init__.py b/SoftwareProperties/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/SoftwareProperties/__init__.py
diff --git a/UpdateManager/__init__.py b/UpdateManager/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/UpdateManager/__init__.py
diff --git a/debian/changelog b/debian/changelog
index 14665ebe..568c421b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+update-manager (0.40) dapper; urgency=low
+
+  * new upstream release
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 15 Nov 2005 17:22:12 +0100
+
 update-manager (0.37.1+svn20050404.15) breezy; urgency=low
 
   * added intltool to build-depends (for rosetta)
diff --git a/debian/rules b/debian/rules
index 0bcb0ce1..1ff49b61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,37 +6,18 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc
+PKG=update-manager
+DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
+DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
 
 
 build: build-stamp
 
-build-stamp:  config.status
+build-stamp:  
 	dh_testdir
 
 	# Add here commands to compile the package.
-	$(MAKE)
+	./setup.py build 
 	#/usr/bin/docbook-to-man debian/update-manager.sgml > update-manager.1
 
 	# intltool for rosetta
@@ -68,8 +49,7 @@ install: build
 	dh_installdirs
 
 	# Add here commands to install the package into debian/update-manager.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/update-manager
-
+	./setup.py install --prefix=$(CURDIR)/debian/$(PKG)/usr
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -99,7 +79,7 @@ binary-arch: build install
 	dh_compress
 	dh_fixperms
 #	dh_perl
-#	dh_python
+	dh_python
 #	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
@@ -107,5 +87,11 @@ binary-arch: build install
 	dh_md5sums
 	dh_builddeb
 
+arch-build:
+	rm -rf debian/arch-build
+	mkdir -p debian/arch-build/$(PKG)-$(DEBVER)
+	baz inventory -s | xargs cp -a --parents --target=debian/arch-build/$(PKG)-$(DEBVER)
+	(cd debian/arch-build/$(PKG)-$(DEBVER); $(DEB_BUILD_PROG))
+
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install arch-build
diff --git a/po/Makefile b/po/Makefile
index 326de934..801a9e20 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -2,15 +2,25 @@
 DOMAIN=update-manager
 PO_FILES := $(wildcard *.po)
 
-update-po: $(DOMAIN).pot $(patsubst %.po,%.mo,$(wildcard *.po))
-	# update the po files 
-	for f in $(PO_FILES); do \
-		intltool-update -r $${f%.po}  -g $(DOMAIN); \
-	done
+all: update-po
 
+# update the pot
 $(DOMAIN).pot:
 	intltool-update -p -g $(DOMAIN)
 
+# merge the new stuff into the po files
+merge-po: $(PO_FILES)
+	intltool-update -r -g $(DOMAIN); 
+
+# create mo from the pos
 %.mo : %.po
 	mkdir -p mo/$(subst .po,,$<)/LC_MESSAGES/ 
 	msgfmt $< -o mo/$(subst .po,,$<)/LC_MESSAGES/$(DOMAIN).mo 
+
+# dummy target 
+update-po: $(DOMAIN).pot merge-po $(patsubst %.po,%.mo,$(wildcard *.po))
+	# update the po files 
+	#for f in $(PO_FILES); do \
+	#	intltool-update -r $${f%.po}  -g $(DOMAIN); \
+	#done
+
diff --git a/po/da.po b/po/da.po
index 7ed6c5a2..a7bbc09d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:34+0100\n"
+"POT-Creation-Date: 2005-11-15 17:30+0100\n"
 "PO-Revision-Date: 2005-03-28 11:31+0200\n"
 "Last-Translator: Martin Willemoes Hansen <mwh@sysrq.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index e9f17259..487b6ac1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:34+0100\n"
+"POT-Creation-Date: 2005-11-15 17:30+0100\n"
 "PO-Revision-Date: 2005-04-02 08:46+0200\n"
 "Last-Translator: Frank Arnold <frank@scirocco-5v-turbo.de>\n"
 "Language-Team: German GNOME Translations <gnome-de@gnome.org>\n"
diff --git a/po/el.po b/po/el.po
index e5fe887e..54ad76bc 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:34+0100\n"
+"POT-Creation-Date: 2005-11-15 17:30+0100\n"
 "PO-Revision-Date: 2005-03-05 14:33+0200\n"
 "Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
diff --git a/po/en_CA.po b/po/en_CA.po
index 74239ac9..f4a8810b 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:34+0100\n"
+"POT-Creation-Date: 2005-11-15 17:30+0100\n"
 "PO-Revision-Date: 2005-04-03 01:26-0500\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
diff --git a/po/es.po b/po/es.po
index 63379dac..d84851e4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:34+0100\n"
+"POT-Creation-Date: 2005-11-15 17:30+0100\n"
 "PO-Revision-Date: 2005-04-04 15:00+0200\n"
 "Last-Translator: Jorge Bernal <koke@amedias.org>\n"
 "Language-Team: Spanish <traductores@gnome.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 052ea4a0..947bae35 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:34+0100\n"
+"POT-Creation-Date: 2005-11-15 17:30+0100\n"
 "PO-Revision-Date: 2005-03-30 08:30+0200\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Finnish <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 991eb14a..31aedf4b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.37.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:34+0100\n"
+"POT-Creation-Date: 2005-11-15 17:30+0100\n"
 "PO-Revision-Date: 2005-04-04 19:43+0200\n"
 "Last-Translator: \n"
 "Language-Team: French <gnomefr@traduc.org>\n"
diff --git a/po/hu.po b/po/hu.po
index 29af5aaa..589ca786 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:34+0100\n"
+"POT-Creation-Date: 2005-11-15 17:30+0100\n"
 "PO-Revision-Date: 2005-04-03 12:32+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
diff --git a/po/ja.po b/po/ja.po
index 70eaef4d..fe451caa 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:34+0100\n"
+"POT-Creation-Date: 2005-11-15 17:30+0100\n"
 "PO-Revision-Date: 2005-03-23 10:23+0900\n"
 "Last-Translator: Hiroyuki Ikezoe <ikezoe@good-day.co.jp>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index e7c040d9..b9152855 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager cvs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:34+0100\n"
+"POT-Creation-Date: 2005-11-15 17:30+0100\n"
 "PO-Revision-Date: 2005-03-25 17:23+0100\n"
 "Last-Translator: Zygmunt Krynicki <zyga@www.suxx.pl>\n"
 "Language-Team: Polish <translators@gnomepl.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 73804fdb..181fd772 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:34+0100\n"
+"POT-Creation-Date: 2005-11-15 17:30+0100\n"
 "PO-Revision-Date: 2005-03-29 13:36-0300\n"
 "Last-Translator: Raphael Higino <raphaelh@uai.com.br>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-status@listas.cipsga.org."
diff --git a/po/ro.po b/po/ro.po
index 18044294..47120b8f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:34+0100\n"
+"POT-Creation-Date: 2005-11-15 17:30+0100\n"
 "PO-Revision-Date: 2005-03-03 19:28+0200\n"
 "Last-Translator: Dan Damian <dand@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
diff --git a/po/rw.po b/po/rw.po
index 9d69dff3..77eb4c9b 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:34+0100\n"
+"POT-Creation-Date: 2005-11-15 17:30+0100\n"
 "PO-Revision-Date: 2005-03-31 20:55-0700\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
diff --git a/po/sv.po b/po/sv.po
index 2469d629..7fa1b236 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:34+0100\n"
+"POT-Creation-Date: 2005-11-15 17:30+0100\n"
 "PO-Revision-Date: 2005-03-26 15:14+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/xh.po b/po/xh.po
index 5b6a3a9f..80ddfe38 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:34+0100\n"
+"POT-Creation-Date: 2005-11-15 17:30+0100\n"
 "PO-Revision-Date: 2005-03-30 13:25+0200\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3680cc58..fbb2e86c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 16:34+0100\n"
+"POT-Creation-Date: 2005-11-15 17:30+0100\n"
 "PO-Revision-Date: 2005-03-21 22:00+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
diff --git a/src/update-manager b/src/update-manager
index ca896ac0..5ab60e43 100644
--- a/src/update-manager
+++ b/src/update-manager
@@ -549,10 +549,7 @@ class UpdateManager:
     self.dl_size = 0
     self.all_changes = {}
     self.dist = self.get_dist()
-    if os.path.exists("../data/update-manager.glade"):
-      self.Glade = gtk.glade.XML("../data/update-manager.glade")
-    else:
-      self.Glade = gtk.glade.XML("/usr/share/update-manager/update-manager.glade")
+    self.Glade = gtk.glade.XML("/usr/share/update-manager/glade/update-manager.glade")
 
     self.NumUpdates = self.Glade.get_widget("num_updates")
     self.main_window = self.Glade.get_widget("MainWindow")