diff -u system-config-printer-1.1.3+git20090218/debian/changelog system-config-printer-1.1.3+git20090218/debian/changelog
--- system-config-printer-1.1.3+git20090218/debian/changelog
+++ system-config-printer-1.1.3+git20090218/debian/changelog
@@ -1,3 +1,13 @@
+system-config-printer (1.1.3+git20090218-0ubuntu4) jaunty; urgency=low
+
+  * debian/patches/26_notification.patch:
+    - don't use actions in notifications unless using
+    - the gnome-stracciatella session (LP: #328604)
+  * debian/rules:
+    - Move /usr/local/lib to /usr/lib 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 04 Mar 2009 16:49:46 -0500
+
 system-config-printer (1.1.3+git20090218-0ubuntu3) jaunty; urgency=low
 
   * Build for all python versions >= 2.5.
diff -u system-config-printer-1.1.3+git20090218/debian/rules system-config-printer-1.1.3+git20090218/debian/rules
--- system-config-printer-1.1.3+git20090218/debian/rules
+++ system-config-printer-1.1.3+git20090218/debian/rules
@@ -12,6 +12,7 @@
 
 binary-install/system-config-printer-common::
 	dh_pysupport -psystem-config-printer-common /usr/share/system-config-printer/
+	mv $(CURDIR)/debian/tmp/usr/local/lib $(CURDIR)/debian/tmp/usr/
 
 binary-install/system-config-printer-gnome::
 	dh_pysupport -psystem-config-printer-gnome /usr/share/system-config-printer/
diff -u system-config-printer-1.1.3+git20090218/debian/patches/26_notification.patch system-config-printer-1.1.3+git20090218/debian/patches/26_notification.patch
--- system-config-printer-1.1.3+git20090218/debian/patches/26_notification.patch
+++ system-config-printer-1.1.3+git20090218/debian/patches/26_notification.patch
@@ -1,6 +1,6 @@
 diff -uNr system-config-printer-1.1.3+git20090218/applet.py system-config-printer-1.1.3+git20090218.patched/applet.py
 --- system-config-printer-1.1.3+git20090218/applet.py	2009-02-17 16:08:15.000000000 +0100
-+++ system-config-printer-1.1.3+git20090218.patched/applet.py	2009-03-04 11:52:11.000000000 +0100
++++ system-config-printer-1.1.3+git20090218.patched/applet.py	2009-03-04 22:11:19.000000000 +0100
 @@ -120,9 +120,16 @@
              else:
                  text = _("No driver for this printer.")
@@ -8,7 +8,7 @@
 -            n.set_urgency (pynotify.URGENCY_CRITICAL)
 -            n.add_action ("setup-printer", _("Search"),
 -                          lambda x, y: self.setup_printer (x, y, name, devid))
-+            if os.environ['gnome-stracciatella']:
++            if os.environ["GDMSESSION"] == "gnome-stracciatella":
 +                n.set_urgency (pynotify.URGENCY_CRITICAL)
 +                n.add_action ("setup-printer", _("Search"),
 +                              lambda x, y:
@@ -34,7 +34,7 @@
 -                                                                    missing_pkgs))
 -                except:
 -                    pass
-+                if os.environ['gnome-stracciatella']:
++                if os.environ["GDMSESSION"] == "gnome-stracciatella":
 +                    try:
 +                        self.packagekit = installpackage.PackageKit ()
 +                        n.add_action ("install-driver", _("Install"),
@@ -59,7 +59,7 @@
 -                              lambda x, y: self.print_test_page (x, y, name, devid))
 -                n.add_action ("configure", _("Configure"),
 -                              lambda x, y: self.configure (x, y, name))
-+                if os.environ['gnome-stracciatella']:
++                if os.environ["GDMSESSION"] == "gnome-stracciatella":
 +                    n.set_urgency (pynotify.URGENCY_NORMAL)
 +                    n.add_action ("test-page", _("Print test page"),
 +                                  lambda x, y:
@@ -80,7 +80,7 @@
 -                              lambda x, y: self.print_test_page (x, y, name, devid))
 -                n.add_action ("find-driver", _("Find driver"),
 -                              lambda x, y: self.find_driver (x, y, name, devid))
-+                if os.environ['gnome-stracciatella']:
++                if os.environ["GDMSESSION"] == "gnome-stracciatella":
 +                    n.set_urgency (pynotify.URGENCY_CRITICAL)
 +                    n.add_action ("test-page", _("Print test page"),
 +                                  lambda x, y:
@@ -137,6 +137,19 @@
 +                widget.show()
 +
 +            xml.signal_autoconnect(self)
+diff -uNr system-config-printer-1.1.3+git20090218/jobviewer.py system-config-printer-1.1.3+git20090218.patched/jobviewer.py
+--- system-config-printer-1.1.3+git20090218/jobviewer.py	2009-02-17 12:39:05.000000000 +0100
++++ system-config-printer-1.1.3+git20090218.patched/jobviewer.py	2009-03-04 22:10:21.000000000 +0100
+@@ -1177,7 +1177,8 @@
+         notification = pynotify.Notification (title, text, 'printer')
+         reason.user_notified = True
+         notification.set_urgency (urgency)
+-        notification.set_timeout (pynotify.EXPIRES_NEVER)
++        if os.environ["GDMSESSION"] == "gnome-stracciatella":
++            notification.set_timeout (pynotify.EXPIRES_NEVER)
+         notification.connect ('closed',
+                               self.on_state_reason_notification_closed)
+         self.state_reason_notifications[reason.get_tuple ()] = notification
 diff -uNr system-config-printer-1.1.3+git20090218/system-config-printer.py system-config-printer-1.1.3+git20090218.patched/system-config-printer.py
 --- system-config-printer-1.1.3+git20090218/system-config-printer.py	2009-02-18 14:15:24.000000000 +0100
 +++ system-config-printer-1.1.3+git20090218.patched/system-config-printer.py	2009-03-04 11:03:41.000000000 +0100