[SCM] muon packaging branch, gsoc-floris-2014, updated. 427d98cf3bf7a0c83601fda2acffecf03e17fe84

[Floris-Andrei Stoica-Marcu]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/muon.git;a=commitdiff;h=427d98c

The following commit has been merged in the gsoc-floris-2014 branch:
commit 427d98cf3bf7a0c83601fda2acffecf03e17fe84
Author: Floris-Andrei Stoica-Marcu <floris.sm at gmail.com>
Date:   Tue Jul 22 18:38:17 2014 +0300

    Workaround for the perl script to remain executable
---
 debian/check-language-support.install     |  8 --------
 debian/control                            |  6 ------
 debian/muon.install                       |  2 +-
 debian/patches/disabled_tests.diff        | 33 -------------------------------
 debian/rules                              |  3 ++-
 debian/scripts/langtools/language-options |  0
 6 files changed, 3 insertions(+), 49 deletions(-)

diff --git a/debian/check-language-support.install b/debian/check-language-support.install
deleted file mode 100644
index 85d907b..0000000
--- a/debian/check-language-support.install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/make -f
-
-debian/scripts/check-language-support /usr/share/kde4/apps/muon/scripts
-debian/scripts/language_support_pkgs.py /usr/share/kde4/apps/muon/scripts
-debian/scripts/data/check-language-support.1 /usr/share/kde4/apps/muon/scripts/data
-debian/scripts/data/pkg_depends /usr/share/kde4/apps/muon/scripts/data
-debian/scripts/langtools/language-options /usr/share/kde4/apps/muon/scripts/langtools
-debian/scripts/langtools/main-countries /usr/share/kde4/apps/muon/scripts/langtools
diff --git a/debian/control b/debian/control
index dd20e9d..83e0cfe 100644
--- a/debian/control
+++ b/debian/control
@@ -104,9 +104,3 @@ Description: Muon debugging symbols
  experienced a Muon crash without this package
  installed, please install it, try to reproduce the problem and fill a bug
  report with a new backtrace attached.
- 
-Package: check-language-support
-Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
-Description: The check-language-support script
- It finds missing locale packages.
diff --git a/debian/muon.install b/debian/muon.install
index f29e076..707df88 100644
--- a/debian/muon.install
+++ b/debian/muon.install
@@ -7,5 +7,5 @@ usr/share/icons/hicolor/16x16/apps/muon.png
 usr/share/icons/hicolor/64x64/apps/muon.png
 usr/share/icons/hicolor/48x48/apps/muon.png
 usr/share/icons/hicolor/256x256/apps/muon.png
-usr/share/kde4/apps/muon/muonui.rc
+usr/share/kde4/apps/muon
 usr/share/kde4/config.kcfg/muon.kcfg
diff --git a/debian/patches/disabled_tests.diff b/debian/patches/disabled_tests.diff
deleted file mode 100644
index 25a28da..0000000
--- a/debian/patches/disabled_tests.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/libmuon/backends/ApplicationBackend/tests/CMakeLists.txt
-+++ b/libmuon/backends/ApplicationBackend/tests/CMakeLists.txt
-@@ -9,5 +9,5 @@
-         ${KDE4_KIO_LIBS} ${QAPT_LIBRARY})
- endmacro(libmuon_add_unit_test)
- 
--libmuon_add_unit_test(applicationbackendtest ApplicationBackendTest.cpp)
--libmuon_add_unit_test(reviewstest ReviewsTest.cpp)
-+#libmuon_add_unit_test(applicationbackendtest ApplicationBackendTest.cpp)
-+#libmuon_add_unit_test(reviewstest ReviewsTest.cpp)
---- a/libmuon/backends/KNSBackend/tests/CMakeLists.txt
-+++ b/libmuon/backends/KNSBackend/tests/CMakeLists.txt
-@@ -1,8 +1,8 @@
- include_directories(..)
- 
--kde4_add_unit_test(knsbackendtest KNSBackendTest.cpp)
-+#kde4_add_unit_test(knsbackendtest KNSBackendTest.cpp)
- target_link_libraries(knsbackendtest
--    muonprivate
-+    #muonprivate2
-     
-     ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY}
-     ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KIO_LIBS} ${LIBATTICA_LIBRARIES}
---- a/libmuon/backends/KNSBackend/CMakeLists.txt
-+++ b/libmuon/backends/KNSBackend/CMakeLists.txt
-@@ -1,6 +1,6 @@
- include_directories(${LIBATTICA_INCLUDE_DIR})
- 
--add_subdirectory(tests)
-+#add_subdirectory(tests)
- 
- set(knsbackend_SRCS
-     KNSBackend.cpp
diff --git a/debian/rules b/debian/rules
index e38586b..c58162c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,11 @@
 	dh $@ --parallel --dbg-package=muon-dbg --with kde --with python3
 	
 override_dh_makeshlibs:
-	dh_makeshlibs -Xusr/lib/kde4/ -V 'libmuonprivate2 (=2.2.65)'
+	dh_makeshlibs -Xusr/lib/kde4/ -V 'libmuonprivate2 (=2.2.65-1)'
 
 override_dh_install:
 	dh_install --fail-missing
+	cp debian/scripts debian/muon/usr/share/kde4/apps/muon/ -r
 
 override_dh_auto_test:
 	./debian/testScript.sh && exit $?
diff --git a/debian/scripts/langtools/language-options b/debian/scripts/langtools/language-options
old mode 100644
new mode 100755

-- 
muon packaging