[SCM] KDE Utilities module packaging branch, master, updated. debian/4.6.5-3-7-g18638ef

Eshat Cakar eshat-guest at alioth.debian.org
Tue Oct 11 22:11:09 UTC 2011


The following commit has been merged in the master branch:
commit 8c495cb74585a91db220e4f4998f043009598e9c
Author: Eshat Cakar <info at eshat.de>
Date:   Tue Oct 11 22:32:53 2011 +0200

    kcalc patch applied upstream, remove it
---
 debian/patches/kcalc_key_bindings.diff |   96 --------------------------------
 debian/patches/series                  |    1 -
 2 files changed, 0 insertions(+), 97 deletions(-)

diff --git a/debian/patches/kcalc_key_bindings.diff b/debian/patches/kcalc_key_bindings.diff
deleted file mode 100644
index 11e6e4e..0000000
--- a/debian/patches/kcalc_key_bindings.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-Author: Evan Teran <eteran at alum.rit.edu>
-Origin: http://websvn.kde.org/?revision=1240130&view=revision
-Description: This patch reverts a faulty commit which broke the key bindings in kcalc.
-
---- a/kcalc/kcalc.ui
-+++ b/kcalc/kcalc.ui
-@@ -616,7 +616,7 @@
-              <string>7</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">7</string>
-+             <string>7</string>
-             </property>
-            </widget>
-           </item>
-@@ -632,7 +632,7 @@
-              <string>8</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">8</string>
-+             <string>8</string>
-             </property>
-            </widget>
-           </item>
-@@ -648,7 +648,7 @@
-              <string>9</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">9</string>
-+             <string>9</string>
-             </property>
-            </widget>
-           </item>
-@@ -680,7 +680,7 @@
-              <string>4</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">4</string>
-+             <string>4</string>
-             </property>
-            </widget>
-           </item>
-@@ -696,7 +696,7 @@
-              <string>5</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">5</string>
-+             <string>5</string>
-             </property>
-            </widget>
-           </item>
-@@ -712,7 +712,7 @@
-              <string>6</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">6</string>
-+             <string>6</string>
-             </property>
-            </widget>
-           </item>
-@@ -728,7 +728,7 @@
-              <string>1</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">1</string>
-+             <string>1</string>
-             </property>
-            </widget>
-           </item>
-@@ -744,7 +744,7 @@
-              <string>2</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">2</string>
-+             <string>2</string>
-             </property>
-            </widget>
-           </item>
-@@ -760,7 +760,7 @@
-              <string>3</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">3</string>
-+             <string>3</string>
-             </property>
-            </widget>
-           </item>
-@@ -786,7 +786,7 @@
-              <string>0</string>
-             </property>
-             <property name="shortcut">
--             <string notr="true">0</string>
-+             <string>0</string>
-             </property>
-            </widget>
-           </item>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c19ff3f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kcalc_key_bindings.diff

-- 
KDE Utilities module packaging



More information about the pkg-kde-commits mailing list