=== modified file 'data/cddistupgrader'
--- data/cddistupgrader	2011-03-09 15:15:15 +0000
+++ data/cddistupgrader	2011-11-08 09:42:40 +0000
@@ -20,5 +20,12 @@
 # extract the tar
 tar xzf "$UPGRADER_DIR"/"$TAR"
 
+# apply any patches needed before running the upgrade
+for apatch in /usr/share/update-notifier/upgrader-patches/*.diff; do
+    if patch --dry-run < "$apatch"; then
+        patch < "$apatch"
+    fi
+done
+
 # run it
 gksu -- "$TMPDIR"/"$CODENAME" --cdrom "$CDROM_MOUNT"

=== added file 'debian/update-manager-downloader-fix2.diff'
--- debian/update-manager-downloader-fix2.diff	1970-01-01 00:00:00 +0000
+++ debian/update-manager-downloader-fix2.diff	2011-11-08 09:31:08 +0000
@@ -0,0 +1,46 @@
+=== modified file 'UpdateManager/Core/DistUpgradeFetcherCore.py'
+--- UpdateManager/Core/DistUpgradeFetcherCore.py	2011-07-15 15:32:30 +0000
++++ UpdateManager/Core/DistUpgradeFetcherCore.py	2011-11-01 13:22:16 +0000
+@@ -68,12 +68,9 @@
+             f = self.tmpdir+"/"+os.path.basename(self.new_dist.upgradeTool)
+             sig = self.tmpdir+"/"+os.path.basename(self.new_dist.upgradeToolSig)
+             print "authenticate '%s' against '%s' " % (os.path.basename(f),os.path.basename(sig))
+-            if not self.gpgauthenticate(f, sig):
+-                return False
+-
+-        # we may return False here by default if we want to make a sig
+-        # mandatory
+-        return True
++            if self.gpgauthenticate(f, sig):
++                return True
++        return False
+ 
+     def gpgauthenticate(self, file, signature,
+                         keyring='/etc/apt/trusted.gpg'):
+@@ -249,6 +246,12 @@
+                   _("Fetching the upgrade failed. There may be a network "
+                     "problem. "))
+             return
++        if not self.authenticate():
++            self.error(_("Authentication failed"),
++                  _("Authenticating the upgrade failed. There may be a problem "
++                    "with the network or with the server. "))
++            self.cleanup()
++            return
+         if not self.extractDistUpgrader():
+             self.error(_("Failed to extract"),
+                   _("Extracting the upgrade failed. There may be a problem "
+@@ -261,12 +264,6 @@
+                     "with the network or with the server. "))
+             self.cleanup()
+             return
+-        if not self.authenticate():
+-            self.error(_("Authentication failed"),
+-                  _("Authenticating the upgrade failed. There may be a problem "
+-                    "with the network or with the server. "))
+-            self.cleanup()
+-            return
+         try:
+             # check if we can execute, if we run it via sudo we will
+             # not know otherwise, sudo/gksu will not raise a exception
+

=== modified file 'debian/update-notifier-common.dirs'
--- debian/update-notifier-common.dirs	2010-06-29 19:31:20 +0000
+++ debian/update-notifier-common.dirs	2011-11-08 09:41:00 +0000
@@ -3,4 +3,5 @@
 var/lib/update-notifier
 var/lib/update-notifier/user.d
 etc/update-motd.d
-usr/share/update-notifier/plugins/cache-changed
\ No newline at end of file
+usr/share/update-notifier/plugins/cache-changed
+usr/share/update-notifier/upgrader-patches

=== modified file 'debian/update-notifier-common.install'
--- debian/update-notifier-common.install	2010-11-17 19:36:12 +0000
+++ debian/update-notifier-common.install	2011-11-08 09:40:56 +0000
@@ -8,3 +8,4 @@
 usr/share/update-notifier/notify-reboot-required
 usr/lib/update-notifier/
 usr/share/locale
+debian/update-manager-downloader-fix2.diff usr/share/update-notifier/upgrader-patches