rev 15604 - in trunk/packages/kdeadmin/debian: . patches
Didier Raboud
odyx-guest at alioth.debian.org
Mon Aug 10 14:47:20 UTC 2009
Author: odyx-guest
Date: 2009-08-10 14:47:15 +0000 (Mon, 10 Aug 2009)
New Revision: 15604
Added:
trunk/packages/kdeadmin/debian/patches/03_stick_to_qt.diff
trunk/packages/kdeadmin/debian/patches/04_fix_runtime_fail_type_mismatch.diff
Modified:
trunk/packages/kdeadmin/debian/changelog
trunk/packages/kdeadmin/debian/patches/series
Log:
kdeadmin: Add patches 03_stick_to_qt.diff and 04_fix_runtime_fail_type_mismatch.diff
* Add patch 03_stick_to_qt.diff to avoid a "missing kpushbutton" crash
(Closes: #540735)
- Set urgency high for RC bugfixing.
* Add patch 04_fix_runtime_fail_type_mismatch.diff to fix a runtime failure
due to type mismatch.
Modified: trunk/packages/kdeadmin/debian/changelog
===================================================================
--- trunk/packages/kdeadmin/debian/changelog 2009-08-10 13:00:49 UTC (rev 15603)
+++ trunk/packages/kdeadmin/debian/changelog 2009-08-10 14:47:15 UTC (rev 15604)
@@ -1,8 +1,13 @@
-kdeadmin (4:4.3.0-2) UNRELEASED; urgency=low
+kdeadmin (4:4.3.0-2) UNRELEASED; urgency=high
* Add watch file.
* Refresh 01_system_config_printer_kde_cupsutils.diff to correctly import
options.py. THIS NEED TO BE TESTED !
+ * Add patch 03_stick_to_qt.diff to avoid a "missing kpushbutton" crash
+ (Closes: #540735)
+ - Set urgency high for RC bugfixing.
+ * Add patch 04_fix_runtime_fail_type_mismatch.diff to fix a runtime failure
+ due to type mismatch.
-- Didier Raboud <didier at raboud.com> Sat, 08 Aug 2009 21:42:18 +0200
Added: trunk/packages/kdeadmin/debian/patches/03_stick_to_qt.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/03_stick_to_qt.diff (rev 0)
+++ trunk/packages/kdeadmin/debian/patches/03_stick_to_qt.diff 2009-08-10 14:47:15 UTC (rev 15604)
@@ -0,0 +1,184 @@
+Description: Disable KDE-specific custom-widgets. For an unknown reason, they
+ fail to compile
+Origin: vendor
+Author: Didier Raboud <didier at raboud.com>
+Bug: http://bugs.debian.org/540735
+Last-Update: 2009-08-10
+Index: kdeadmin-4.3.0/system-config-printer-kde/system-config-printer.ui
+===================================================================
+--- kdeadmin-4.3.0.orig/system-config-printer-kde/system-config-printer.ui 2009-08-10 13:58:13.000000000 +0200
++++ kdeadmin-4.3.0/system-config-printer-kde/system-config-printer.ui 2009-08-10 14:00:07.000000000 +0200
+@@ -68,7 +68,7 @@
+ <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+- <widget class="KPushButton" name="btnNewPrinter">
++ <widget class="QPushButton" name="btnNewPrinter">
+ <property name="text">
+ <string>New Local Printer</string>
+ </property>
+@@ -89,7 +89,7 @@
+ </widget>
+ </item>
+ <item row="1" column="0">
+- <widget class="KPushButton" name="btnNewPrinterNetwork">
++ <widget class="QPushButton" name="btnNewPrinterNetwork">
+ <property name="text">
+ <string>New Network Printer</string>
+ </property>
+@@ -110,7 +110,7 @@
+ </widget>
+ </item>
+ <item row="2" column="0">
+- <widget class="KPushButton" name="btnNewPrinterSpecial">
++ <widget class="QPushButton" name="btnNewPrinterSpecial">
+ <property name="text">
+ <string>New Special Printer</string>
+ </property>
+@@ -131,7 +131,7 @@
+ </widget>
+ </item>
+ <item row="3" column="0">
+- <widget class="KPushButton" name="btnNewClass">
++ <widget class="QPushButton" name="btnNewClass">
+ <property name="text">
+ <string>New Printer Class</string>
+ </property>
+@@ -357,7 +357,7 @@
+ </widget>
+ </item>
+ <item row="0" column="1">
+- <widget class="KLineEdit" name="entPName"/>
++ <widget class="QLineEdit" name="entPName"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="lblPLocation">
+@@ -370,7 +370,7 @@
+ </widget>
+ </item>
+ <item row="1" column="1">
+- <widget class="KLineEdit" name="entPLocation"/>
++ <widget class="QLineEdit" name="entPLocation"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="lblPDescription">
+@@ -383,7 +383,7 @@
+ </widget>
+ </item>
+ <item row="2" column="1">
+- <widget class="KLineEdit" name="entPDescription"/>
++ <widget class="QLineEdit" name="entPDescription"/>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="lblPDevice2">
+@@ -396,7 +396,7 @@
+ </widget>
+ </item>
+ <item row="3" column="1">
+- <widget class="KLineEdit" name="entPDevice"/>
++ <widget class="QLineEdit" name="entPDevice"/>
+ </item>
+ </layout>
+ </item>
+@@ -465,7 +465,7 @@
+ </widget>
+ </item>
+ <item row="0" column="2">
+- <widget class="KPushButton" name="btnChangePPD">
++ <widget class="QPushButton" name="btnChangePPD">
+ <property name="text">
+ <string>Change...</string>
+ </property>
+@@ -570,21 +570,21 @@
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+- <widget class="KPushButton" name="btnPrintTestPage">
++ <widget class="QPushButton" name="btnPrintTestPage">
+ <property name="text">
+ <string>Print Test Page</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+- <widget class="KPushButton" name="btnSelfTest">
++ <widget class="QPushButton" name="btnSelfTest">
+ <property name="text">
+ <string>Print Self Test</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+- <widget class="KPushButton" name="btnCleanHeads">
++ <widget class="QPushButton" name="btnCleanHeads">
+ <property name="text">
+ <string>Clean Print Heads</string>
+ </property>
+@@ -608,7 +608,7 @@
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+- <widget class="KPushButton" name="btnDelete">
++ <widget class="QPushButton" name="btnDelete">
+ <property name="text">
+ <string>Remove Printer</string>
+ </property>
+@@ -668,7 +668,7 @@
+ </widget>
+ </item>
+ <item row="0" column="1">
+- <widget class="KComboBox" name="cmbPStartBanner"/>
++ <widget class="QComboBox" name="cmbPStartBanner"/>
+ </item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer">
+@@ -700,7 +700,7 @@
+ </widget>
+ </item>
+ <item row="1" column="1">
+- <widget class="KComboBox" name="cmbPEndBanner"/>
++ <widget class="QComboBox" name="cmbPEndBanner"/>
+ </item>
+ <item row="1" column="2">
+ <spacer name="horizontalSpacer_3">
+@@ -769,14 +769,14 @@
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <item>
+- <widget class="KPushButton" name="btnPAddUser">
++ <widget class="QPushButton" name="btnPAddUser">
+ <property name="text">
+ <string>Add</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+- <widget class="KPushButton" name="btnPDelUser">
++ <widget class="QPushButton" name="btnPDelUser">
+ <property name="text">
+ <string>Remove</string>
+ </property>
+@@ -1761,23 +1761,6 @@
+ </item>
+ </layout>
+ </widget>
+- <customwidgets>
+- <customwidget>
+- <class>KComboBox</class>
+- <extends>QComboBox</extends>
+- <header>kcombobox.h</header>
+- </customwidget>
+- <customwidget>
+- <class>KLineEdit</class>
+- <extends>QLineEdit</extends>
+- <header>klineedit.h</header>
+- </customwidget>
+- <customwidget>
+- <class>KPushButton</class>
+- <extends>QPushButton</extends>
+- <header>kpushbutton.h</header>
+- </customwidget>
+- </customwidgets>
+ <resources/>
+ <connections/>
+ </ui>
Added: trunk/packages/kdeadmin/debian/patches/04_fix_runtime_fail_type_mismatch.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/04_fix_runtime_fail_type_mismatch.diff (rev 0)
+++ trunk/packages/kdeadmin/debian/patches/04_fix_runtime_fail_type_mismatch.diff 2009-08-10 14:47:15 UTC (rev 15604)
@@ -0,0 +1,18 @@
+Description: s-c-p-k fails with a type mismatch error - fix that.
+Origin: vendor
+Author: Didier Raboud <didier at raboud.com>
+Last-Update: 2009-08-10
+Index: kdeadmin-4.3.0/system-config-printer-kde/options.py
+===================================================================
+--- kdeadmin-4.3.0.orig/system-config-printer-kde/options.py 2009-08-10 14:26:59.000000000 +0200
++++ kdeadmin-4.3.0/system-config-printer-kde/options.py 2009-08-10 14:30:40.000000000 +0200
+@@ -137,8 +137,7 @@
+ self.ipp_type == int and
+ self.combobox_map != None):
+ self.widget.clear()
+- for each in supported:
+- self.widget.addItem(self.combobox_dict[each])
++ self.widget.addItem(self.combobox_dict[supported])
+ if original_value != None:
+ self.original_value = self.ipp_type (original_value)
+ self.set_widget_value (self.original_value)
Modified: trunk/packages/kdeadmin/debian/patches/series
===================================================================
--- trunk/packages/kdeadmin/debian/patches/series 2009-08-10 13:00:49 UTC (rev 15603)
+++ trunk/packages/kdeadmin/debian/patches/series 2009-08-10 14:47:15 UTC (rev 15604)
@@ -1,2 +1,4 @@
01_system_config_printer_kde_cupsutils.diff
02_kuser_first_uid_gid_fix.diff
+03_stick_to_qt.diff
+04_fix_runtime_fail_type_mismatch.diff
More information about the pkg-kde-commits
mailing list