[SCM] KDE Admin module packaging branch, master, updated. debian/4.10.5-1
Pino Toscano
pino at alioth.debian.org
Sat Jul 13 12:34:53 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeadmin.git;a=commitdiff;h=ef952cf
The following commit has been merged in the master branch:
commit ef952cfa47f23e189d848efd4802576d379c28c5
Author: Josep Febrer Salord <jfebrer at gmail.com>
Date: Sat Apr 6 02:32:03 2013 +0200
Drop system-config-printer-kde patches.
---
debian/changelog | 4 +
debian/patches/lp_lpadmin_warning.patch | 119 --------------------
debian/patches/series | 2 -
.../system_config_printer_kde_cupsutils.diff | 66 -----------
..._config_printer_kde_scroll_printer_options.diff | 106 -----------------
5 files changed, 4 insertions(+), 293 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 525c088..2e9f576 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ kdeadmin (4:4.10.2-0r0) UNRELEASED; urgency=low
* Remove python build dependency, system-config-printer-kde has been removed.
* Add nepomuk-core-dev build dependency.
* Remove system-config-printer-kde package which has been dropped upstream.
+ * Update patches:
+ - Drop system_config_printer_kde_cupsutils.diff, not needed.
+ - Drop lp_lpadmin_warning.patch, not needed.
+ - Drop system_config_printer_kde_scroll_printer_options.diff, not applied.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 06 Apr 2013 01:30:34 +0200
diff --git a/debian/patches/lp_lpadmin_warning.patch b/debian/patches/lp_lpadmin_warning.patch
deleted file mode 100644
index 5483e2d..0000000
--- a/debian/patches/lp_lpadmin_warning.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-Description: Adds a warning to the user to be in the lp/lpadmin group
- This tool does not works if the user is not in the lp/lpadmin group.
- This patch adds a note to the user informing this situation.
-Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Bug-Debian: http://bugs.debian.org/659155
-Forwarded: no
-Last-Update: 2012-08-24
-
---- kdeadmin-4.8.4.orig/system-config-printer-kde/system-config-printer.ui
-+++ kdeadmin-4.8.4/system-config-printer-kde/system-config-printer.ui
-@@ -6,7 +6,7 @@
- <rect>
- <x>0</x>
- <y>0</y>
-- <width>826</width>
-+ <width>850</width>
- <height>509</height>
- </rect>
- </property>
-@@ -42,11 +42,11 @@
- </sizepolicy>
- </property>
- <property name="currentIndex">
-- <number>2</number>
-+ <number>0</number>
- </property>
- <widget class="QWidget" name="page">
-- <layout class="QVBoxLayout" name="verticalLayout_4">
-- <item>
-+ <layout class="QGridLayout" name="gridLayout_17">
-+ <item row="0" column="0">
- <widget class="QLabel" name="label">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-@@ -65,7 +65,7 @@
- </property>
- </widget>
- </item>
-- <item>
-+ <item row="1" column="0">
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="KPushButton" name="btnNewPrinter">
-@@ -153,7 +153,30 @@ print to.</string>
- </item>
- </layout>
- </item>
-- <item>
-+ <item row="2" column="0">
-+ <spacer name="verticalSpacer_5">
-+ <property name="orientation">
-+ <enum>Qt::Vertical</enum>
-+ </property>
-+ <property name="sizeHint" stdset="0">
-+ <size>
-+ <width>478</width>
-+ <height>23</height>
-+ </size>
-+ </property>
-+ </spacer>
-+ </item>
-+ <item row="3" column="0">
-+ <widget class="QLabel" name="warningLabel">
-+ <property name="text">
-+ <string><strong>Note:</strong> your user needs to be in the lp / lpadmin group for being able to use this tool.</string>
-+ </property>
-+ <property name="textFormat">
-+ <enum>Qt::RichText</enum>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="4" column="0">
- <spacer name="verticalSpacer_4">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
-@@ -877,8 +900,8 @@ print to.</string>
- <rect>
- <x>0</x>
- <y>0</y>
-- <width>532</width>
-- <height>427</height>
-+ <width>92</width>
-+ <height>22</height>
- </rect>
- </property>
- <layout class="QGridLayout" name="gridLayout_5">
-@@ -912,7 +935,7 @@ print to.</string>
- <rect>
- <x>0</x>
- <y>0</y>
-- <width>515</width>
-+ <width>535</width>
- <height>1026</height>
- </rect>
- </property>
-@@ -1774,11 +1797,6 @@ if they are not already set by the appli
- <header>kcombobox.h</header>
- </customwidget>
- <customwidget>
-- <class>KIntSpinBox</class>
-- <extends>QSpinBox</extends>
-- <header>knuminput.h</header>
-- </customwidget>
-- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
-@@ -1788,6 +1806,11 @@ if they are not already set by the appli
- <extends>QPushButton</extends>
- <header>kpushbutton.h</header>
- </customwidget>
-+ <customwidget>
-+ <class>KIntSpinBox</class>
-+ <extends>QSpinBox</extends>
-+ <header>knuminput.h</header>
-+ </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
diff --git a/debian/patches/series b/debian/patches/series
index 105f27c..21811d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-system_config_printer_kde_cupsutils.diff
kuser_first_uid_gid_fix.diff
-lp_lpadmin_warning.patch
diff --git a/debian/patches/system_config_printer_kde_cupsutils.diff b/debian/patches/system_config_printer_kde_cupsutils.diff
deleted file mode 100644
index 14c0d2f..0000000
--- a/debian/patches/system_config_printer_kde_cupsutils.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Cope with system-config-printer split (now depends only on python-cupshelpers)
- Thanks to Josselin Mouette for the orginal patch.
-Origin: vendor: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525558#21
-Bug-Debian: http://bugs.debian.org/525558
-Bug-Debian: http://bugs.debian.org/597071
-Author: Didier Raboud <didier at raboud.com>
-Author: Modestas Vainius <modax at debian.org>
-Last-Update: 2011-10-02
-
---- a/system-config-printer-kde/system-config-printer-kde.py
-+++ b/system-config-printer-kde/system-config-printer-kde.py
-@@ -33,11 +33,6 @@
-
- import sys, os, time, traceback, re, tempfile, httplib, thread, string
-
--#load modules from system-config-printer-common (debug, smburi), change path here if you have it installed elsewhere
--SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/system-config-printer"
--if os.path.exists(SYSTEM_CONFIG_PRINTER_DIR + "/debug.py"):
-- sys.path.append(SYSTEM_CONFIG_PRINTER_DIR)
--
- from PyQt4.QtCore import *
- from PyQt4.QtGui import *
- from PyQt4 import uic
-@@ -71,12 +66,12 @@
- except:
- PYSMB_AVAILABLE=False
-
--# These come from system-config-printer
--import config
-+# These come from python-cupsutils
- import cupshelpers, options
- from optionwidgets import OptionWidget
--from smburi import SMBURI
--from debug import *
-+from cupshelpers.smburi import SMBURI
-+from cupshelpers.debug import *
-+
- import authconn
-
- import dbus
-@@ -975,10 +970,6 @@
- # otherwise use cups' default one
- custom_testpage = None
- opt = self.ppd.findOption ("PageSize")
-- if opt:
-- print opt
-- custom_testpage = os.path.join(SYSTEM_CONFIG_PRINTER_DIR, 'testpage-%s.ps' % opt.defchoice.lower())
-- print custom_testpage
-
- if custom_testpage and os.path.exists(custom_testpage):
- debugprint ('Printing custom test page ' + custom_testpage)
-@@ -2167,11 +2158,9 @@
- #self.connect(self.btnNCAddMember, SIGNAL("clicked()"), self.slot_btnNCAddMember_clicked)
- #self.connect(self.btnNCDelMember, SIGNAL("clicked()"), self.slot_btnNCDelMember_clicked)
-
-- # Optionally disable downloadable driver support.
-- #if not config.DOWNLOADABLE_DRIVER_SUPPORT:
-- if True:
-- self.rbtnNPDownloadableDriverSearch.setEnabled(False)
-- self.downloadableDriverSearchFrame.hide()
-+ # Disable downloadable driver support.
-+ self.rbtnNPDownloadableDriverSearch.setEnabled(False)
-+ self.downloadableDriverSearchFrame.hide()
-
- """
- # Set up OpenPrinting widgets.
diff --git a/debian/patches/system_config_printer_kde_scroll_printer_options.diff b/debian/patches/system_config_printer_kde_scroll_printer_options.diff
deleted file mode 100644
index 395cf24..0000000
--- a/debian/patches/system_config_printer_kde_scroll_printer_options.diff
+++ /dev/null
@@ -1,106 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: Fix size problems of the system-config-printer-kde Printer Properties dialog
-Forwarded: no
-Origin: vendor
-Last-Update: 2010-09-17
-
-Without this patch, whenever system-config-printer-kde printer Properties
-dialog was opened, it (or its container, i.e. System Settings) would be
-stretched vertically to accommodate the size of the likely huge "Options" tab.
-This patch fixes the problem by putting the contents of problematic "Options"
-tab into QScrollArea widget (like it is already done with "Job Options" tab).
-The patch also makes sure that QScrollArea's of both "Options" and "Job
-Options" tabs are wide enough and initially do not need a horizontal scroll
-bar.
---- a/system-config-printer-kde/system-config-printer-kde.py
-+++ b/system-config-printer-kde/system-config-printer-kde.py
-@@ -376,6 +376,11 @@ class GUI(QWidget):
- self.ui.lblPOptions.hide()
- self.ui.lblPInstallOptions.hide()
-
-+ # Enforce minimumSize of Job Options scroll area viewport in
-+ # order for the scroll area widget to fit horizontally
-+ self.ui.scrollArea.viewport().setMinimumSize( \
-+ self.ui.scrollArea.widget().minimumSizeHint().width(), 0)
-+
- return self.ui
-
- # now called dests_iconview_item_activated() in the Gnome version
-@@ -1323,6 +1328,8 @@ class GUI(QWidget):
- self.swPInstallOptions.show_all()
- self.swPOptions.show_all()
- """
-+ self.ui.optionsPageScrollArea.viewport().setMinimumSize( \
-+ self.ui.optionsPageScrollArea.widget().minimumSizeHint().width(), 0)
-
-
- # Class members
---- a/system-config-printer-kde/system-config-printer.ui
-+++ b/system-config-printer-kde/system-config-printer.ui
-@@ -865,26 +865,29 @@ print to.</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
-- <widget class="QWidget" name="optionsPageWidget" native="true">
-- <layout class="QGridLayout" name="gridLayout_5">
-- <item row="0" column="0">
-- <layout class="QVBoxLayout" name="vbPOptions"/>
-- </item>
-- </layout>
-- </widget>
-- </item>
-- <item>
-- <spacer name="verticalSpacer">
-- <property name="orientation">
-- <enum>Qt::Vertical</enum>
-+ <widget class="QScrollArea" name="optionsPageScrollArea">
-+ <property name="frameShape">
-+ <enum>QFrame::NoFrame</enum>
- </property>
-- <property name="sizeHint" stdset="0">
-- <size>
-- <width>20</width>
-- <height>531</height>
-- </size>
-+ <property name="widgetResizable">
-+ <bool>true</bool>
- </property>
-- </spacer>
-+ <widget class="QWidget" name="optionsPageWidget">
-+ <property name="geometry">
-+ <rect>
-+ <x>0</x>
-+ <y>0</y>
-+ <width>532</width>
-+ <height>426</height>
-+ </rect>
-+ </property>
-+ <layout class="QGridLayout" name="gridLayout_5">
-+ <item row="0" column="0">
-+ <layout class="QVBoxLayout" name="vbPOptions"/>
-+ </item>
-+ </layout>
-+ </widget>
-+ </widget>
- </item>
- </layout>
- </widget>
-@@ -895,6 +898,9 @@ print to.</string>
- <layout class="QGridLayout" name="gridLayout_9">
- <item row="0" column="0">
- <widget class="QScrollArea" name="scrollArea">
-+ <property name="frameShape">
-+ <enum>QFrame::NoFrame</enum>
-+ </property>
- <property name="verticalScrollBarPolicy">
- <enum>Qt::ScrollBarAlwaysOn</enum>
- </property>
-@@ -906,7 +912,7 @@ print to.</string>
- <rect>
- <x>0</x>
- <y>0</y>
-- <width>509</width>
-+ <width>514</width>
- <height>1026</height>
- </rect>
- </property>
--
KDE Admin module packaging
More information about the pkg-kde-commits
mailing list