diff -Nru update-notifier-0.118ubuntu1/aclocal.m4 update-notifier-0.118.1ubuntu1/aclocal.m4
--- update-notifier-0.118ubuntu1/aclocal.m4	2012-01-09 12:00:29.000000000 +0000
+++ update-notifier-0.118.1ubuntu1/aclocal.m4	2012-01-18 08:36:52.000000000 +0000
@@ -260,6 +260,10 @@
 	      [CATOBJEXT=.mo
                DATADIRNAME=lib])
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -637,7 +641,7 @@
 INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
        INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
       INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< [$]@' 
       INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
       INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
     INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
@@ -690,7 +694,7 @@
 if test $? -ne 0; then
    AC_MSG_ERROR([perl 5.8.1 is required for intltool])
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    AC_MSG_RESULT([$IT_PERL_VERSION])
 fi
 if test "x$2" != "xno-xml"; then
diff -Nru update-notifier-0.118ubuntu1/configure update-notifier-0.118.1ubuntu1/configure
--- update-notifier-0.118ubuntu1/configure	2012-01-09 12:00:30.000000000 +0000
+++ update-notifier-0.118.1ubuntu1/configure	2012-01-18 08:36:53.000000000 +0000
@@ -6038,7 +6038,7 @@
 INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
        INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
       INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< $@'
       INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
       INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
     INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -6364,7 +6364,7 @@
 if test $? -ne 0; then
    as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
 $as_echo "$IT_PERL_VERSION" >&6; }
 fi
@@ -7028,6 +7028,10 @@
 fi
 
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
diff -Nru update-notifier-0.118ubuntu1/data/cddistupgrader update-notifier-0.118.1ubuntu1/data/cddistupgrader
--- update-notifier-0.118ubuntu1/data/cddistupgrader	2011-08-22 11:58:02.000000000 +0000
+++ update-notifier-0.118.1ubuntu1/data/cddistupgrader	2011-11-08 09:42:40.000000000 +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/uprader-patches/*.diff; do
+    if patch --dry-run < "$apatch"; then
+        patch < "$apatch"
+    fi
+done
+
 # run it
 gksu -- "$TMPDIR"/"$CODENAME" --cdrom "$CDROM_MOUNT"
diff -Nru update-notifier-0.118ubuntu1/debian/changelog update-notifier-0.118.1ubuntu1/debian/changelog
--- update-notifier-0.118ubuntu1/debian/changelog	2012-01-09 12:00:10.000000000 +0000
+++ update-notifier-0.118.1ubuntu1/debian/changelog	2012-01-18 08:36:48.000000000 +0000
@@ -1,3 +1,11 @@
+update-notifier (0.118.1ubuntu1) precise; urgency=low
+
+  * add support to apply patches when running the release upgrader
+  * change default release upgrade check interval to 14 days
+    (LP: #918062)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 18 Jan 2012 09:36:47 +0100
+
 update-notifier (0.118ubuntu1) precise; urgency=low
 
   * fix "fsck doesn't update system info on login" LP: #692355
diff -Nru update-notifier-0.118ubuntu1/debian/update-manager-downloader-fix2.diff update-notifier-0.118.1ubuntu1/debian/update-manager-downloader-fix2.diff
--- update-notifier-0.118ubuntu1/debian/update-manager-downloader-fix2.diff	1970-01-01 00:00:00.000000000 +0000
+++ update-notifier-0.118.1ubuntu1/debian/update-manager-downloader-fix2.diff	2011-11-08 09:31:08.000000000 +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
+
diff -Nru update-notifier-0.118ubuntu1/debian/update-notifier-common.dirs update-notifier-0.118.1ubuntu1/debian/update-notifier-common.dirs
--- update-notifier-0.118ubuntu1/debian/update-notifier-common.dirs	2011-08-22 11:58:02.000000000 +0000
+++ update-notifier-0.118.1ubuntu1/debian/update-notifier-common.dirs	2011-11-08 09:41:00.000000000 +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
diff -Nru update-notifier-0.118ubuntu1/debian/update-notifier-common.install update-notifier-0.118.1ubuntu1/debian/update-notifier-common.install
--- update-notifier-0.118ubuntu1/debian/update-notifier-common.install	2011-08-22 11:58:02.000000000 +0000
+++ update-notifier-0.118.1ubuntu1/debian/update-notifier-common.install	2011-11-08 09:40:56.000000000 +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
diff -Nru update-notifier-0.118ubuntu1/po/Makefile.in.in update-notifier-0.118.1ubuntu1/po/Makefile.in.in
--- update-notifier-0.118ubuntu1/po/Makefile.in.in	2012-01-09 12:00:31.000000000 +0000
+++ update-notifier-0.118.1ubuntu1/po/Makefile.in.in	2012-01-18 08:36:54.000000000 +0000
@@ -49,8 +49,8 @@
 XGETTEXT = @XGETTEXT@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
 
 ALL_LINGUAS = @ALL_LINGUAS@
 
diff -Nru update-notifier-0.118ubuntu1/po/update-notifier.pot update-notifier-0.118.1ubuntu1/po/update-notifier.pot
--- update-notifier-0.118ubuntu1/po/update-notifier.pot	2012-01-09 12:00:32.000000000 +0000
+++ update-notifier-0.118.1ubuntu1/po/update-notifier.pot	2012-01-18 08:36:55.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-09 13:00+0100\n"
+"POT-Creation-Date: 2012-01-18 09:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -307,19 +307,19 @@
 msgstr ""
 
 #: ../ui/reboot-dialog.ui.h:3
-msgid ""
-"The computer needs to restart to finish installing updates. Please save your "
-"work before continuing."
+msgid "_Restart Now"
 msgstr ""
 
 #: ../ui/reboot-dialog.ui.h:4
-msgid "_Restart Now"
+msgid ""
+"The computer needs to restart to finish installing updates. Please save your "
+"work before continuing."
 msgstr ""
 
 #: ../data/update-notifier.desktop.in.h:1
-msgid "Check for available updates automatically"
+msgid "Update Notifier"
 msgstr ""
 
 #: ../data/update-notifier.desktop.in.h:2
-msgid "Update Notifier"
+msgid "Check for available updates automatically"
 msgstr ""
diff -Nru update-notifier-0.118ubuntu1/src/update-notifier.h update-notifier-0.118.1ubuntu1/src/update-notifier.h
--- update-notifier-0.118ubuntu1/src/update-notifier.h	2011-11-21 14:14:51.000000000 +0000
+++ update-notifier-0.118.1ubuntu1/src/update-notifier.h	2012-01-18 08:35:55.000000000 +0000
@@ -62,7 +62,7 @@
 
 // this is the script and the time to run the release-upgrades checker
 #define RELEASE_UPGRADE_CHECKER "/usr/lib/update-manager/check-new-release-gtk"
-#define RELEASE_UPGRADE_CHECK_WAIT 60*60*24*7
+#define RELEASE_UPGRADE_CHECK_WAIT 60*60*24*14
 
 // cache-changed plugin dir
 #define CACHE_CHANGED_PLUGIN_DIR "/usr/share/update-notifier/plugins/cache-changed"