I started work on updating the Debian package to version 1.0.4, but have
not had time to finish it yet. The work-in-progress patch is attached.
--
Sam Morris <[EMAIL PROTECTED]>
Index: debian/patches/13_python_paths.patch
===================================================================
--- debian/patches/13_python_paths.patch (revision 16620)
+++ debian/patches/13_python_paths.patch (working copy)
@@ -1,7 +1,7 @@
-Index: system-config-printer-1.0.0/applet.py
+Index: system-config-printer-1.0.4/applet.py
===================================================================
---- system-config-printer-1.0.0.orig/applet.py 2008-06-22 16:37:24.966821412 +0200
-+++ system-config-printer-1.0.0/applet.py 2008-06-22 16:45:27.922818962 +0200
+--- system-config-printer-1.0.4.orig/applet.py 2008-07-22 16:45:26.000000000 +0100
++++ system-config-printer-1.0.4/applet.py 2008-07-22 16:56:45.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
@@ -20,7 +20,7 @@
import pprint
import dbus
-@@ -124,11 +125,11 @@ class NewPrinterNotification(dbus.servic
+@@ -124,7 +125,7 @@
os.unlink (filename)
import sys
sys.path.append (APPDIR)
@@ -29,15 +29,10 @@
(missing_pkgs,
missing_exes) = cupshelpers.missingPackagesAndExecutables (ppd)
-- from ppds import ppdMakeModelSplit
-+ from cupsutils.ppds import ppdMakeModelSplit
- (make, model) = ppdMakeModelSplit (printer['printer-make-and-model'])
- driver = make + " " + model
- if status < self.STATUS_GENERIC_DRIVER:
-Index: system-config-printer-1.0.0/authconn.py
+Index: system-config-printer-1.0.4/authconn.py
===================================================================
---- system-config-printer-1.0.0.orig/authconn.py 2008-06-22 16:37:24.954820655 +0200
-+++ system-config-printer-1.0.0/authconn.py 2008-06-22 16:44:51.635319642 +0200
+--- system-config-printer-1.0.4.orig/authconn.py 2008-07-09 12:23:44.000000000 +0100
++++ system-config-printer-1.0.4/authconn.py 2008-07-22 16:47:51.000000000 +0100
@@ -19,7 +19,7 @@
import cups
@@ -47,24 +42,24 @@
_ = lambda x: x
def set_gettext_function (fn):
-Index: system-config-printer-1.0.0/contextmenu.py
+Index: system-config-printer-1.0.4/contextmenu.py
===================================================================
---- system-config-printer-1.0.0.orig/contextmenu.py 2008-06-22 16:37:24.942820876 +0200
-+++ system-config-printer-1.0.0/contextmenu.py 2008-06-22 16:44:51.639322665 +0200
-@@ -23,7 +23,7 @@
+--- system-config-printer-1.0.4.orig/contextmenu.py 2008-07-10 16:31:58.000000000 +0100
++++ system-config-printer-1.0.4/contextmenu.py 2008-07-22 16:55:20.000000000 +0100
+@@ -25,7 +25,7 @@
import cups
import errordialogs
import jobviewer
-from debug import *
+from cupsutils.debug import *
+ import userdefault
_ = lambda x: x
- def set_gettext_function (x):
-Index: system-config-printer-1.0.0/jobviewer.py
+Index: system-config-printer-1.0.4/jobviewer.py
===================================================================
---- system-config-printer-1.0.0.orig/jobviewer.py 2008-06-22 16:37:24.934819719 +0200
-+++ system-config-printer-1.0.0/jobviewer.py 2008-06-22 16:44:51.639322665 +0200
-@@ -33,7 +33,7 @@ import pango
+--- system-config-printer-1.0.4.orig/jobviewer.py 2008-07-10 16:31:58.000000000 +0100
++++ system-config-printer-1.0.4/jobviewer.py 2008-07-22 16:47:51.000000000 +0100
+@@ -34,7 +34,7 @@
import sys
import time
@@ -73,11 +68,11 @@
import config
import statereason
import errordialogs
-Index: system-config-printer-1.0.0/monitor.py
+Index: system-config-printer-1.0.4/monitor.py
===================================================================
---- system-config-printer-1.0.0.orig/monitor.py 2008-06-22 16:37:24.922820429 +0200
-+++ system-config-printer-1.0.0/monitor.py 2008-06-22 16:44:51.639322665 +0200
-@@ -22,7 +22,7 @@ import dbus
+--- system-config-printer-1.0.4.orig/monitor.py 2008-07-08 17:20:28.000000000 +0100
++++ system-config-printer-1.0.4/monitor.py 2008-07-22 16:47:51.000000000 +0100
+@@ -22,7 +22,7 @@
import dbus.glib
import gobject
import time
@@ -86,11 +81,11 @@
import pprint
global _
-Index: system-config-printer-1.0.0/pysmb.py
+Index: system-config-printer-1.0.4/pysmb.py
===================================================================
---- system-config-printer-1.0.0.orig/pysmb.py 2008-06-22 16:37:24.914820250 +0200
-+++ system-config-printer-1.0.0/pysmb.py 2008-06-22 16:44:51.639322665 +0200
-@@ -30,7 +30,7 @@ import gobject
+--- system-config-printer-1.0.4.orig/pysmb.py 2008-07-10 16:31:58.000000000 +0100
++++ system-config-printer-1.0.4/pysmb.py 2008-07-22 16:47:51.000000000 +0100
+@@ -31,7 +31,7 @@
import gtk
import os
import pwd
@@ -99,10 +94,10 @@
class AuthContext:
def __init__ (self, parent=None, workgroup='', user='', passwd=''):
-Index: system-config-printer-1.0.0/system-config-printer.py
+Index: system-config-printer-1.0.4/system-config-printer.py
===================================================================
---- system-config-printer-1.0.0.orig/system-config-printer.py 2008-06-22 16:37:24.902820959 +0200
-+++ system-config-printer-1.0.0/system-config-printer.py 2008-06-22 16:45:44.063322922 +0200
+--- system-config-printer-1.0.4.orig/system-config-printer.py 2008-07-10 16:31:58.000000000 +0100
++++ system-config-printer-1.0.4/system-config-printer.py 2008-07-22 16:54:11.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
@@ -118,8 +113,8 @@
-
import errno
import sys, os, tempfile, time, traceback, re, httplib
- import signal, thread
-@@ -54,16 +51,21 @@ if len(sys.argv)>1 and sys.argv[1] == '-
+ import subprocess
+@@ -55,11 +52,16 @@
import cups
cups.require ("1.9.27")
@@ -134,21 +129,14 @@
import gobject # for TYPE_STRING and TYPE_PYOBJECT
from optionwidgets import OptionWidget
-from debug import *
--import ppds
+from cupsutils.debug import *
-+from cupsutils import ppds
import probe_printer
import gtk_label_autowrap
from gtk_treeviewtooltips import TreeViewTooltips
--import openprinting
-+from cupsutils import openprinting
- import urllib
- import troubleshoot
- import contextmenu
-Index: system-config-printer-1.0.0/troubleshoot/base.py
+Index: system-config-printer-1.0.4/troubleshoot/base.py
===================================================================
---- system-config-printer-1.0.0.orig/troubleshoot/base.py 2008-06-22 16:37:24.882820024 +0200
-+++ system-config-printer-1.0.0/troubleshoot/base.py 2008-06-22 16:44:51.643323732 +0200
+--- system-config-printer-1.0.4.orig/troubleshoot/base.py 2008-07-09 16:35:37.000000000 +0100
++++ system-config-printer-1.0.4/troubleshoot/base.py 2008-07-22 16:47:51.000000000 +0100
@@ -21,7 +21,7 @@
import gtk
@@ -156,12 +144,12 @@
-from debug import *
+from cupsutils.debug import *
- TEXT_start_print_admin_tool = _("To start this tool, select "
- "System->Administration->Printing "
-Index: system-config-printer-1.0.0/troubleshoot/CheckPPDSanity.py
+ __all__ = [ 'gtk',
+ '_',
+Index: system-config-printer-1.0.4/troubleshoot/CheckPPDSanity.py
===================================================================
---- system-config-printer-1.0.0.orig/troubleshoot/CheckPPDSanity.py 2008-06-22 16:37:24.874819845 +0200
-+++ system-config-printer-1.0.0/troubleshoot/CheckPPDSanity.py 2008-06-22 16:44:51.643323732 +0200
+--- system-config-printer-1.0.4.orig/troubleshoot/CheckPPDSanity.py 2008-07-09 16:35:37.000000000 +0100
++++ system-config-printer-1.0.4/troubleshoot/CheckPPDSanity.py 2008-07-22 16:47:51.000000000 +0100
@@ -20,7 +20,7 @@
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -171,10 +159,10 @@
import os
import subprocess
from base import *
-Index: system-config-printer-1.0.0/my-default-printer.py
+Index: system-config-printer-1.0.4/my-default-printer.py
===================================================================
---- system-config-printer-1.0.0.orig/my-default-printer.py 2008-06-22 16:45:52.599322051 +0200
-+++ system-config-printer-1.0.0/my-default-printer.py 2008-06-22 16:45:54.370814587 +0200
+--- system-config-printer-1.0.4.orig/my-default-printer.py 2008-07-07 12:23:24.000000000 +0100
++++ system-config-printer-1.0.4/my-default-printer.py 2008-07-22 16:47:51.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
Index: debian/patches/16_dont_monitor_session.patch
===================================================================
--- debian/patches/16_dont_monitor_session.patch (revision 16620)
+++ debian/patches/16_dont_monitor_session.patch (working copy)
@@ -1,8 +1,8 @@
-Index: system-config-printer-1.0.0/applet.py
+Index: system-config-printer-1.0.4/applet.py
===================================================================
---- system-config-printer-1.0.0.orig/applet.py 2008-06-21 11:18:30.729929293 +0200
-+++ system-config-printer-1.0.0/applet.py 2008-06-21 11:18:32.917927838 +0200
-@@ -264,19 +264,6 @@ if __name__ == '__main__':
+--- system-config-printer-1.0.4.orig/applet.py 2008-07-09 12:23:44.000000000 +0100
++++ system-config-printer-1.0.4/applet.py 2008-07-22 16:44:31.000000000 +0100
+@@ -263,19 +263,6 @@
print >> sys.stderr, ("%s: unable to initialize pynotify" %
PROGRAM_NAME)
Index: debian/patches/08_stock_icons.patch
===================================================================
--- debian/patches/08_stock_icons.patch (revision 16620)
+++ debian/patches/08_stock_icons.patch (working copy)
@@ -1,11 +0,0 @@
---- a/system-config-printer.glade 2008-06-08 13:11:01.229281585 +0200
-+++ b/system-config-printer.glade 2008-06-08 13:13:11.829284169 +0200
-@@ -139,7 +139,7 @@
- <child internal-child="image">
- <widget class="GtkImage" id="image70">
- <property name="visible">True</property>
-- <property name="stock">gtk-add</property>
-+ <property name="stock">gtk-new</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
Index: debian/patches/12_remove_redhat.patch
===================================================================
--- debian/patches/12_remove_redhat.patch (revision 16620)
+++ debian/patches/12_remove_redhat.patch (working copy)
@@ -1,6 +1,8 @@
---- a/Makefile.am 2008-06-08 13:19:54.097285829 +0200
-+++ b/Makefile.am 2008-06-08 13:22:17.021810733 +0200
-@@ -74,42 +74,38 @@
+Index: system-config-printer-1.0.4/Makefile.am
+===================================================================
+--- system-config-printer-1.0.4.orig/Makefile.am 2008-07-10 16:31:58.000000000 +0100
++++ system-config-printer-1.0.4/Makefile.am 2008-07-22 16:40:06.000000000 +0100
+@@ -122,42 +122,38 @@
install-desktopDATA: $(desktop_DATA)
mkdir -p $(DESTDIR)$(desktopdir)
mkdir -p $(DESTDIR)$(desktopdir)
@@ -51,9 +53,11 @@
EXTRA_DIST=\
$(nobase_pkgdata_SCRIPTS) \
---- a/Makefile.in 2008-05-27 19:14:22.000000000 +0200
-+++ b/Makefile.in 2008-06-08 13:22:40.633281953 +0200
-@@ -889,42 +889,38 @@
+Index: system-config-printer-1.0.4/Makefile.in
+===================================================================
+--- system-config-printer-1.0.4.orig/Makefile.in 2008-07-10 16:39:02.000000000 +0100
++++ system-config-printer-1.0.4/Makefile.in 2008-07-22 16:40:06.000000000 +0100
+@@ -1028,42 +1028,38 @@
install-desktopDATA: $(desktop_DATA)
mkdir -p $(DESTDIR)$(desktopdir)
mkdir -p $(DESTDIR)$(desktopdir)
Index: debian/patches/series
===================================================================
--- debian/patches/series (revision 16620)
+++ debian/patches/series (working copy)
@@ -1,7 +1,5 @@
-01_no_rhpl.patch
-02_translations.patch
+#02_translations.patch
03_elementtree.patch
-08_stock_icons.patch
10_show_manage_jobs.patch
11_use_gksu.patch
12_remove_redhat.patch
Index: debian/patches/01_no_rhpl.patch
===================================================================
--- debian/patches/01_no_rhpl.patch (revision 16620)
+++ debian/patches/01_no_rhpl.patch (working copy)
@@ -1,13 +0,0 @@
-Index: system-config-printer-1.0.0/cupshelpers.py
-===================================================================
---- system-config-printer-1.0.0.orig/cupshelpers.py 2008-05-27 11:42:33.000000000 +0200
-+++ system-config-printer-1.0.0/cupshelpers.py 2008-06-21 11:18:18.770427107 +0200
-@@ -19,7 +19,7 @@
- ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- import cups, pprint, os, tempfile, re
--from rhpl.translate import _, N_
-+from gettext import gettext as _
- import locale
- from debug import *
-
Index: debian/patches/15_close_shortcut.patch
===================================================================
--- debian/patches/15_close_shortcut.patch (revision 16620)
+++ debian/patches/15_close_shortcut.patch (working copy)
@@ -1,6 +1,8 @@
---- a/system-config-printer.glade 2008-06-14 17:00:30.689968417 +0200
-+++ b/system-config-printer.glade 2008-06-14 17:02:11.657969728 +0200
-@@ -89,7 +89,7 @@
+Index: system-config-printer-1.0.4/system-config-printer.glade
+===================================================================
+--- system-config-printer-1.0.4.orig/system-config-printer.glade 2008-07-10 16:31:58.000000000 +0100
++++ system-config-printer-1.0.4/system-config-printer.glade 2008-07-22 16:44:11.000000000 +0100
+@@ -171,7 +171,7 @@
<child>
<widget class="GtkImageMenuItem" id="quit">
<property name="visible">True</property>
Index: debian/patches/03_elementtree.patch
===================================================================
--- debian/patches/03_elementtree.patch (revision 16620)
+++ debian/patches/03_elementtree.patch (working copy)
@@ -1,5 +1,7 @@
---- a/openprinting.py 2008-02-17 12:44:10.544206173 +0100
-+++ b/openprinting.py 2008-02-17 12:44:40.834358434 +0100
+Index: system-config-printer-1.0.4/cupshelpers/openprinting.py
+===================================================================
+--- system-config-printer-1.0.4.orig/cupshelpers/openprinting.py 2008-07-09 12:23:44.000000000 +0100
++++ system-config-printer-1.0.4/cupshelpers/openprinting.py 2008-07-22 16:36:51.000000000 +0100
@@ -21,7 +21,10 @@
import urllib, httplib, platform, threading, tempfile, traceback
@@ -9,6 +11,6 @@
+ from xml.etree.ElementTree import XML
+except ImportError:
+ from elementtree.ElementTree import XML
+ from . import Device
- def normalize_space (text):
- result = text.strip ()
+ __all__ = ['OpenPrinting']
Index: debian/changelog
===================================================================
--- debian/changelog (revision 16620)
+++ debian/changelog (working copy)
@@ -1,3 +1,13 @@
+system-config-printer (1.0.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * 01_no_rhpl.patch dropped; upstream now uses gettext.
+ * 03_elementtree.patch, 12_remove_redhat.patch, 13_python_paths.patch,
+ 15_close_shortcut.patch, 16_dont_monitor_session.patch: refreshed.
+ * 08_stock_icons.patch: dropped, not necessary any more.
+
+ -- Sam Morris <[EMAIL PROTECTED]> Tue, 22 Jul 2008 16:44:17 +0100
+
system-config-printer (1.0.0-2) unstable; urgency=low
* Switch to quilt for patch management; build-depend on quilt.
