[SCM] smokekde packaging branch, master, updated. debian/4.7.0-1-2-g62352dc

[David Palacio]

The following commit has been merged in the master branch:
commit 62352dce3cc7f1c1ac21503a5ec3caa7151fa831
Author: David Palacio <dpalacio at orbitalibre.org>
Date:   Fri Sep 23 10:49:58 2011 -0500

    remove patches applied upstream
---
 debian/changelog                                  |    8 +++-
 debian/patches/fix-knewstuff2-binding.patch       |   46 ---------------------
 debian/patches/fix-kutils-linking.patch           |   31 --------------
 debian/patches/fix_smoke_config_install_path.diff |   13 ------
 debian/patches/series                             |    3 -
 5 files changed, 7 insertions(+), 94 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21b9f77..95cde00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,13 @@ smokekde (4:4.7.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 23 Sep 2011 10:41:24 -0500
+  [ David Palacio ]
+  * Remove patches applied upstream:
+    - fix_smoke_config_install_path.diff
+    - fix-knewstuff2-binding.patch
+    - fix-kutils-linking.patch
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 23 Sep 2011 10:47:45 -0500
 
 smokekde (4:4.7.0-1) unstable; urgency=low
 
diff --git a/debian/patches/fix-knewstuff2-binding.patch b/debian/patches/fix-knewstuff2-binding.patch
deleted file mode 100644
index 8242a62..0000000
--- a/debian/patches/fix-knewstuff2-binding.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 783511a71156c4d72b3c8fdcd7694448d532934c Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Tue, 16 Aug 2011 21:45:08 +0200
-Subject: [PATCH] fix knewstuff2 binding
-
-reference actual used classes, like Author, Engine, Entry, and KTranslatable, in addition to Button;
-remove non-existing classes;
-include the proper header for Button
----
- knewstuff2/knewstuff2_includes.h |    1 +
- knewstuff2/smokeconfig.xml       |    7 ++++---
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/knewstuff2/knewstuff2_includes.h b/knewstuff2/knewstuff2_includes.h
-index b394c1d..c8b47eb 100644
---- a/knewstuff2/knewstuff2_includes.h
-+++ b/knewstuff2/knewstuff2_includes.h
-@@ -3,6 +3,7 @@
- #include <knewstuff2/core/category.h>
- #include <knewstuff2/core/ktranslatable.h>
- #include <knewstuff2/core/installation.h>
-+#include <knewstuff2/ui/knewstuffbutton.h>
- #include <knewstuff2/ui/knewstuffaction.h>
- #include <knewstuff2/engine.h>
- #include <knewstuff2/knewstuff_export.h>
-diff --git a/knewstuff2/smokeconfig.xml b/knewstuff2/smokeconfig.xml
-index a60b2bc..a8c54cf 100644
---- a/knewstuff2/smokeconfig.xml
-+++ b/knewstuff2/smokeconfig.xml
-@@ -42,9 +42,10 @@
-         <name>.*i18n.*</name>
-     </functions>
-     <classList>
-+        <class>KNS::Author</class>
-         <class>KNS::Button</class>
--        <class>KNS::CoreEngine</class>
--        <class>KNS::ProviderLoader</class>
--        <class>KNS::UploadDialog</class>
-+        <class>KNS::Engine</class>
-+        <class>KNS::Entry</class>
-+        <class>KNS::KTranslatable</class>
-     </classList>
- </config>
--- 
-1.7.5.4
-
diff --git a/debian/patches/fix-kutils-linking.patch b/debian/patches/fix-kutils-linking.patch
deleted file mode 100644
index 4b76979..0000000
--- a/debian/patches/fix-kutils-linking.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fa260d7399bbeede0aa4c48bf4ae226f3030b3b0 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Tue, 16 Aug 2011 21:41:21 +0200
-Subject: [PATCH] fix kutils linking
-
-instead of linking to the (now empty) kutils library, link directly to the kemoticons, kidletime, kcmutils, and kprintutils libraries
-this avoids potential issues when linking in "as-needed" mode
----
- kutils/CMakeLists.txt |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/kutils/CMakeLists.txt b/kutils/CMakeLists.txt
-index cae67e7..3d61109 100644
---- a/kutils/CMakeLists.txt
-+++ b/kutils/CMakeLists.txt
-@@ -34,8 +34,10 @@ target_link_libraries(smokekutils
-     ${QT_QTGUI_LIBRARY}
-     ${KDE4_KDECORE_LIBS}
-     ${KDE4_KDEUI_LIBS}
--    ${KDE4_KIO_LIBS}
--    ${KDE4_KUTILS_LIBS}
-+    ${KDE4_KEMOTICONS_LIBS}
-+    ${KDE4_KIDLETIME_LIBS}
-+    ${KDE4_KCMUTILS_LIBS}
-+    ${KDE4_KPRINTUTILS_LIBS}
-     smokekdeui
-     ${SMOKE_QTCORE_LIBRARY}
-     ${SMOKE_BASE_LIBRARY}
--- 
-1.7.5.4
-
diff --git a/debian/patches/fix_smoke_config_install_path.diff b/debian/patches/fix_smoke_config_install_path.diff
deleted file mode 100644
index c1b4f23..0000000
--- a/debian/patches/fix_smoke_config_install_path.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: David Palacio <dpalacio at orbitalibre.org>
-Description: Fix installation of kde-config.xml
-Last-Update: 2011-06-24
-Applied-Upstream: 4.7.1, commit:57a7fccf10a22f9541beb94dca6320941ab06f05
-
---- a/kdecore/CMakeLists.txt
-+++ b/kdecore/CMakeLists.txt
-@@ -80,4 +80,4 @@ target_link_libraries(smokekdecore
- set_target_properties(smokekdecore PROPERTIES VERSION 3.0.0 SOVERSION 3 )
- install(TARGETS smokekdecore DESTINATION ${LIB_INSTALL_DIR} )
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../kdecore_smoke.h DESTINATION include/smoke)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kde-config.xml DESTINATION share/${SMOKE_GEN_BIN})
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kde-config.xml DESTINATION share/smokegen)
diff --git a/debian/patches/series b/debian/patches/series
index 02bc90f..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +0,0 @@
-fix_smoke_config_install_path.diff
-fix-kutils-linking.patch
-fix-knewstuff2-binding.patch

-- 
smokekde packaging