[SCM] KDE Admin module packaging branch, kde4.5, updated. debian/4.4.5-4-11-g71b7ee6

Modestas Vainius modax at alioth.debian.org
Fri Sep 17 16:51:18 UTC 2010


The following commit has been merged in the kde4.5 branch:
commit 1b00a4e4ae5eeb674f40763133c7ecb190244d2e
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri Sep 17 19:50:00 2010 +0300

    Adapt 05_system_config_printer_kde_scroll_printer_options.diff to upstream changes.
---
 debian/changelog                                   |    2 ++
 ..._config_printer_kde_scroll_printer_options.diff |   11 +----------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 219d71a..70e9a94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ kdeadmin (4:4.5.1-0r1) UNRELEASED; urgency=low
   [ Modestas Vainius ]
   * Drop 04_system_config_printer_kde_pyqt4.7_issues.diff patch, it was
     backported from upstream.
+  * Adapt 05_system_config_printer_kde_scroll_printer_options.diff to upstream
+    changes.
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Sat, 11 Sep 2010 20:07:52 +0000
 
diff --git a/debian/patches/05_system_config_printer_kde_scroll_printer_options.diff b/debian/patches/05_system_config_printer_kde_scroll_printer_options.diff
index 24fe90f..395cf24 100644
--- a/debian/patches/05_system_config_printer_kde_scroll_printer_options.diff
+++ b/debian/patches/05_system_config_printer_kde_scroll_printer_options.diff
@@ -26,7 +26,7 @@ bar.
          return self.ui
  
      # now called  dests_iconview_item_activated() in the Gnome version
-@@ -1321,6 +1326,8 @@ class GUI(QWidget):
+@@ -1323,6 +1328,8 @@ class GUI(QWidget):
          self.swPInstallOptions.show_all()
          self.swPOptions.show_all()
          """
@@ -37,15 +37,6 @@ bar.
      # Class members
 --- a/system-config-printer-kde/system-config-printer.ui
 +++ b/system-config-printer-kde/system-config-printer.ui
-@@ -548,7 +548,7 @@ print to.</string>
-                <item>
-                 <widget class="QLabel" name="lblNotPublished">
-                  <property name="text">
--                  <string comment="KDE::DoNotExtract" >TextLabel</string>
-+                  <string comment="KDE::DoNotExtract">TextLabel</string>
-                  </property>
-                 </widget>
-                </item>
 @@ -865,26 +865,29 @@ print to.</string>
              </attribute>
              <layout class="QVBoxLayout" name="verticalLayout_3">

-- 
KDE Admin module packaging



More information about the pkg-kde-commits mailing list