- update to system-config-printer-1.0.13
ok jasper@
This commit is contained in:
parent
75280f8be8
commit
f18131fe57
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.8 2008/12/21 11:40:40 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.9 2009/01/31 12:37:30 ajacoutot Exp $
|
||||
|
||||
COMMENT= printer (CUPS) administration tool
|
||||
|
||||
DISTNAME= system-config-printer-1.0.9
|
||||
PKGNAME= ${DISTNAME}p0
|
||||
DISTNAME= system-config-printer-1.0.13
|
||||
CATEGORIES= print sysutils
|
||||
|
||||
HOMEPAGE= http://cyberelk.net/tim/software/system-config-printer/
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (system-config-printer-1.0.9.tar.bz2) = rMuSZSa0xWxHunMt0QKMtA==
|
||||
RMD160 (system-config-printer-1.0.9.tar.bz2) = QQDhB1DrUl2ksdLAQ+i/xr2KQps=
|
||||
SHA1 (system-config-printer-1.0.9.tar.bz2) = jn5dYT7iilLACY3soasAZe/ilHk=
|
||||
SHA256 (system-config-printer-1.0.9.tar.bz2) = cpP43iTmNMJ6EdJZx4p4LzTY6E1mDIeDxNGtkxHmXpw=
|
||||
SIZE (system-config-printer-1.0.9.tar.bz2) = 809643
|
||||
MD5 (system-config-printer-1.0.13.tar.bz2) = piS9DUKojVxWLmxZN/j5AA==
|
||||
RMD160 (system-config-printer-1.0.13.tar.bz2) = yuxAkz3VfvgvpsotsSbWTIvHhjM=
|
||||
SHA1 (system-config-printer-1.0.13.tar.bz2) = sSYCEYYKpsXbM4ce27OxdbvZMeM=
|
||||
SHA256 (system-config-printer-1.0.13.tar.bz2) = ELP2lqK/gg6mX+0KAIxf+rk5YPTIhLMHGL+zBkAwlr4=
|
||||
SIZE (system-config-printer-1.0.13.tar.bz2) = 834669
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.4 2008/09/17 12:00:56 ajacoutot Exp $
|
||||
--- Makefile.in.orig Fri Aug 29 12:33:56 2008
|
||||
+++ Makefile.in Wed Sep 17 13:46:48 2008
|
||||
$OpenBSD: patch-Makefile_in,v 1.5 2009/01/31 12:37:30 ajacoutot Exp $
|
||||
--- Makefile.in.orig Fri Jan 16 11:37:10 2009
|
||||
+++ Makefile.in Sat Jan 31 12:11:42 2009
|
||||
@@ -308,7 +308,7 @@ man_MANS = \
|
||||
dbus_DATA = \
|
||||
newprinternotification.conf
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2008/09/17 12:00:56 ajacoutot Exp $
|
||||
desktop_DATA = \
|
||||
system-config-printer.desktop \
|
||||
print-applet.desktop \
|
||||
@@ -1033,7 +1033,6 @@ install-desktopDATA: $(desktop_DATA)
|
||||
@@ -1042,7 +1042,6 @@ install-desktopDATA: $(desktop_DATA)
|
||||
mkdir -p $(DESTDIR)$(desktopdir)
|
||||
desktop-file-install --vendor redhat \
|
||||
--dir $(DESTDIR)$(desktopdir) \
|
||||
@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2008/09/17 12:00:56 ajacoutot Exp $
|
||||
--add-category System \
|
||||
--add-category Settings \
|
||||
--add-category HardwareSettings \
|
||||
@@ -1042,25 +1041,16 @@ install-desktopDATA: $(desktop_DATA)
|
||||
@@ -1051,25 +1050,16 @@ install-desktopDATA: $(desktop_DATA)
|
||||
system-config-printer.desktop
|
||||
desktop-file-install --vendor redhat \
|
||||
--dir $(DESTDIR)$(desktopdir) \
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-applet_py,v 1.4 2008/10/27 13:29:13 ajacoutot Exp $
|
||||
--- applet.py.orig Tue Oct 21 11:02:45 2008
|
||||
+++ applet.py Mon Oct 27 14:30:20 2008
|
||||
$OpenBSD: patch-applet_py,v 1.5 2009/01/31 12:37:30 ajacoutot Exp $
|
||||
--- applet.py.orig Sat Jan 31 12:09:28 2009
|
||||
+++ applet.py Sat Jan 31 12:10:37 2009
|
||||
@@ -43,7 +43,7 @@ except locale.Error, e:
|
||||
os.environ['LC_ALL'] = 'C'
|
||||
locale.setlocale (locale.LC_ALL, "")
|
||||
@ -14,7 +14,7 @@ $OpenBSD: patch-applet_py,v 1.4 2008/10/27 13:29:13 ajacoutot Exp $
|
||||
STATUS_GENERIC_DRIVER = 2
|
||||
STATUS_NO_DRIVER = 3
|
||||
|
||||
- INSTALL_PACKAGES_COMMAND="/usr/bin/system-install-packages"
|
||||
- INSTALL_PACKAGES_COMMAND="/usr/bin/gpk-install-package-name"
|
||||
+ INSTALL_PACKAGES_COMMAND="/usr/bin/true"
|
||||
|
||||
def __init__ (self, bus):
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-cupshelpers_cupshelpers_py,v 1.2 2008/09/17 12:00:56 ajacoutot Exp $
|
||||
--- cupshelpers/cupshelpers.py.orig Thu Aug 28 15:34:24 2008
|
||||
+++ cupshelpers/cupshelpers.py Wed Sep 17 13:46:48 2008
|
||||
@@ -700,7 +700,7 @@ def missingPackagesAndExecutables(ppd):
|
||||
$OpenBSD: patch-cupshelpers_cupshelpers_py,v 1.3 2009/01/31 12:37:30 ajacoutot Exp $
|
||||
--- cupshelpers/cupshelpers.py.orig Fri Jan 16 10:50:57 2009
|
||||
+++ cupshelpers/cupshelpers.py Sat Jan 31 12:11:42 2009
|
||||
@@ -707,7 +707,7 @@ def missingPackagesAndExecutables(ppd):
|
||||
|
||||
# First, a local function. How to check that something exists
|
||||
# in a path:
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-cupshelpers_cupshelpers_py,v 1.2 2008/09/17 12:00:56 ajacoutot E
|
||||
# Strip out foomatic '%'-style place-holders.
|
||||
p = name.find ('%')
|
||||
if p != -1:
|
||||
@@ -795,8 +795,7 @@ def missingPackagesAndExecutables(ppd):
|
||||
@@ -805,8 +805,7 @@ def missingPackagesAndExecutables(ppd):
|
||||
continue
|
||||
|
||||
exepath = pathcheck (exe,
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-pysmb_py,v 1.4 2008/10/27 13:29:13 ajacoutot Exp $
|
||||
--- pysmb.py.orig Tue Oct 21 11:02:45 2008
|
||||
+++ pysmb.py Mon Oct 27 14:30:20 2008
|
||||
@@ -187,13 +187,13 @@ import os
|
||||
$OpenBSD: patch-pysmb_py,v 1.5 2009/01/31 12:37:30 ajacoutot Exp $
|
||||
--- pysmb.py.orig Fri Jan 16 10:50:57 2009
|
||||
+++ pysmb.py Sat Jan 31 12:11:42 2009
|
||||
@@ -194,13 +194,13 @@ import os
|
||||
import sys
|
||||
import re
|
||||
|
||||
|
@ -1,10 +1,10 @@
|
||||
set_program_name(domain) requires newer py-gtk2, but is kept back
|
||||
due to implied py-Nummeric update.
|
||||
|
||||
$OpenBSD: patch-system-config-printer_py,v 1.6 2008/12/21 11:40:40 ajacoutot Exp $
|
||||
--- system-config-printer.py.orig Tue Oct 21 11:02:45 2008
|
||||
+++ system-config-printer.py Sun Dec 21 12:29:27 2008
|
||||
@@ -98,10 +98,6 @@ busy_cursor = gtk.gdk.Cursor(gtk.gdk.WATCH)
|
||||
$OpenBSD: patch-system-config-printer_py,v 1.7 2009/01/31 12:37:30 ajacoutot Exp $
|
||||
--- system-config-printer.py.orig Fri Jan 16 11:35:26 2009
|
||||
+++ system-config-printer.py Sat Jan 31 12:11:42 2009
|
||||
@@ -101,10 +101,6 @@ busy_cursor = gtk.gdk.Cursor(gtk.gdk.WATCH)
|
||||
ready_cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR)
|
||||
ellipsis = unichr(0x2026)
|
||||
|
||||
@ -15,7 +15,7 @@ $OpenBSD: patch-system-config-printer_py,v 1.6 2008/12/21 11:40:40 ajacoutot Exp
|
||||
try:
|
||||
try_CUPS_SERVER_REMOTE_ANY = cups.CUPS_SERVER_REMOTE_ANY
|
||||
except AttributeError:
|
||||
@@ -333,7 +329,7 @@ class GUI(GtkGUI, monitor.Watcher):
|
||||
@@ -336,7 +332,7 @@ class GUI(GtkGUI, monitor.Watcher):
|
||||
np.NewPrinterWindow.set_transient_for(self.MainWindow)
|
||||
|
||||
# Set up "About" dialog
|
||||
@ -24,8 +24,8 @@ $OpenBSD: patch-system-config-printer_py,v 1.6 2008/12/21 11:40:40 ajacoutot Exp
|
||||
self.AboutDialog.set_version(config.VERSION)
|
||||
self.AboutDialog.set_icon_name('printer')
|
||||
|
||||
@@ -377,7 +373,7 @@ class GUI(GtkGUI, monitor.Watcher):
|
||||
self.dests_iconview.set_item_width (145)
|
||||
@@ -381,7 +377,7 @@ class GUI(GtkGUI, monitor.Watcher):
|
||||
self.dests_iconview.set_row_spacing (20)
|
||||
self.dests_iconview.set_pixbuf_column (1)
|
||||
self.dests_iconview.set_text_column (2)
|
||||
- self.dests_iconview.set_tooltip_column (3)
|
||||
@ -33,7 +33,7 @@ $OpenBSD: patch-system-config-printer_py,v 1.6 2008/12/21 11:40:40 ajacoutot Exp
|
||||
self.dests_iconview.connect ('item-activated',
|
||||
self.dests_iconview_item_activated)
|
||||
self.dests_iconview.connect ('selection-changed',
|
||||
@@ -2479,25 +2475,6 @@ class GUI(GtkGUI, monitor.Watcher):
|
||||
@@ -2511,25 +2507,6 @@ class GUI(GtkGUI, monitor.Watcher):
|
||||
self.changed = set()
|
||||
self.setDataButtonState()
|
||||
|
||||
@ -59,7 +59,7 @@ $OpenBSD: patch-system-config-printer_py,v 1.6 2008/12/21 11:40:40 ajacoutot Exp
|
||||
# Now reconnect, in case the server needed to reload.
|
||||
self.reconnect ()
|
||||
|
||||
@@ -3707,7 +3684,7 @@ class NewPrinterGUI(GtkGUI):
|
||||
@@ -3696,7 +3673,7 @@ class NewPrinterGUI(GtkGUI):
|
||||
# Try to get make and model via SNMP
|
||||
if host:
|
||||
os.environ["HOST"] = host
|
||||
@ -68,7 +68,7 @@ $OpenBSD: patch-system-config-printer_py,v 1.6 2008/12/21 11:40:40 ajacoutot Exp
|
||||
debugprint (host + ": " + cmd)
|
||||
stdout = None
|
||||
try:
|
||||
@@ -5098,7 +5075,7 @@ class NewPrinterGUI(GtkGUI):
|
||||
@@ -5194,7 +5171,7 @@ class NewPrinterGUI(GtkGUI):
|
||||
try:
|
||||
# We want this to be in the current natural language,
|
||||
# so we intentionally don't set LC_ALL=C here.
|
||||
|
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-troubleshoot_CheckPPDSanity_py,v 1.2 2008/09/17 12:00:56 ajacoutot Exp $
|
||||
--- troubleshoot/CheckPPDSanity.py.orig Thu Aug 28 15:34:24 2008
|
||||
+++ troubleshoot/CheckPPDSanity.py Wed Sep 17 13:46:48 2008
|
||||
$OpenBSD: patch-troubleshoot_CheckPPDSanity_py,v 1.3 2009/01/31 12:37:30 ajacoutot Exp $
|
||||
--- troubleshoot/CheckPPDSanity.py.orig Sat Jan 31 12:11:18 2009
|
||||
+++ troubleshoot/CheckPPDSanity.py Sat Jan 31 12:11:34 2009
|
||||
@@ -25,7 +25,7 @@ import os
|
||||
import subprocess
|
||||
from base import *
|
||||
|
||||
-install_cmd = "/usr/bin/system-install-packages"
|
||||
-install_cmd = "/usr/bin/gpk-install-package-name"
|
||||
+install_cmd = "/usr/bin/true"
|
||||
|
||||
class CheckPPDSanity(Question):
|
||||
|
Loading…
x
Reference in New Issue
Block a user