[SCM] KDE Admin module packaging branch, master, updated. debian/4.8.4-1-3-g3f73451

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeadmin.git;a=commitdiff;h=8e3d9c6

The following commit has been merged in the master branch:
commit 8e3d9c6bce2d89b2fba793ea26a2a5e394ad92ff
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Aug 24 16:21:48 2012 -0300

    Add lp_lpadmin_warning.patch.
---
 debian/changelog                        |    4 +-
 debian/patches/lp_lpadmin_warning.patch |  119 +++++++++++++++++++++++++++++++
 debian/patches/series                   |    1 +
 3 files changed, 123 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3637bbf..1d25c12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 kdeadmin (4:4.8.4-2) UNRELEASED; urgency=low
 
-
+  * Add lp_lpadmin_warning.patch to tell the user that it needs to be in the
+    lp/lpadmin group in order to use system-config-printer-kde
+    (Closes: #659155).
 
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Fri, 24 Aug 2012 16:19:54 -0300
 
diff --git a/debian/patches/lp_lpadmin_warning.patch b/debian/patches/lp_lpadmin_warning.patch
new file mode 100644
index 0000000..5483e2d
--- /dev/null
+++ b/debian/patches/lp_lpadmin_warning.patch
@@ -0,0 +1,119 @@
+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 e5d2df9..105f27c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 system_config_printer_kde_cupsutils.diff
 kuser_first_uid_gid_fix.diff
+lp_lpadmin_warning.patch

-- 
KDE Admin module packaging