← Back to branch summary

~ubuntu-branches/ubuntu/precise/kdeadmin/precise

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_01_system-config-printer-kde_fixes.diff

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi, Alessandro Ghersi, Jonathan Riddell
  • Date: 2010-10-17 06:47:21 UTC
  • mfrom: (1.2.50 upstream)
  • Revision ID: james.westby@ubuntu.com-20101017064721-1gc4g44trays84gg
Tags: 4:4.5.2-0ubuntu1
[ Alessandro Ghersi ]
* Merge with Debian git remaining changes:
  - debian/control:
    - Don't ship knetworkconf, it is utterly busted
    - kdeadmin doesn't depend on knetworkconf
    - kde-config-cron conflicts/replaces on kcron (<< 4:4.4.60)
    - system-config-printer-kde depends on system-printer-common
    - system-config-printer-kde doesn't depend on python-cupsutils
    - kdeadmin-dbg depends on kdeadmin
  - debian/patches:
    - Remove 01_system_config_printer_kde_cupsutils.diff, it's only
      relevant for Debian not Ubuntu

[ Jonathan Riddell ]
* New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_01_system-config-printer-kde_fixes.diff
1
 
Index: kdeadmin-4.5.1/system-config-printer-kde/options.py
2
 
===================================================================
3
 
--- kdeadmin-4.5.1.orig/system-config-printer-kde/options.py    2010-08-27 10:09:34.000000000 +0200
4
 
+++ kdeadmin-4.5.1/system-config-printer-kde/options.py 2010-08-30 19:09:32.000000000 +0200
5
 
@@ -133,7 +133,7 @@
6
 
                 self.widget.clear()
7
 
                 if type(supported) == list:
8
 
                     for each in supported:
9
 
-                        self.widget.addItem(each)
10
 
+                        self.widget.addItem(unicode(each))
11
 
                 else:
12
 
                     self.widget.addItem(self.combobox_dict[supported])
13
 
             elif (type(self.widget) == QComboBox and
14
 
Index: kdeadmin-4.5.0b/system-config-printer-kde/system-config-printer-kde.desktop
15
 
===================================================================
16
 
--- kdeadmin-4.5.0b.orig/system-config-printer-kde/system-config-printer-kde.desktop   2010-08-24 14:24:48.896309002 +0100
17
 
+++ kdeadmin-4.5.0b/system-config-printer-kde/system-config-printer-kde.desktop        2010-08-24 14:25:01.328309002 +0100
18
 
@@ -8,7 +8,7 @@
19
 
 X-KDE-ParentApp=kcontrol
20
 
 X-KDE-PluginKeyword=system-config-printer-kde/system-config-printer-kde.py
21
 
 
22
 
-X-KDE-System-Settings-Parent-Category=system-administration
23
 
+X-KDE-System-Settings-Parent-Category=hardware
24
 
 X-KDE-Weight=60
25
 
 
26
 
 Name=Printer Configuration