Merge lp:~agateau/kubuntu-packaging/plasma-widget-menubar-0.1.17 into lp:~kubuntu-packagers/kubuntu-packaging/plasma-widget-menubar

[Aurélien Gâteau]

This branch packages version 0.1.17 of plasma-widget-menubar. It's quite
important as it improves support for Firefox (see bug #878165)

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-12 10:07:37 +0000
+++ debian/changelog	2012-04-04 10:43:42 +0000
@@ -1,3 +1,12 @@
+plasma-widget-menubar (0.1.17-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Drop patch to disable tests as test suite does not require X anymore
+  * Add build dependency on gnome-icon-theme-full so that gtkicontabletest
+    finds the necessary images
+
+ -- Aurélien Gâteau <[e-mail]>  Wed, 04 Apr 2012 10:13:50 +0200
+
 plasma-widget-menubar (0.1.16-0ubuntu1) oneiric; urgency=low
 
   * New upstream bugfix release

=== modified file 'debian/control'
--- debian/control	2011-09-12 10:07:37 +0000
+++ debian/control	2012-04-04 10:43:42 +0000
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Kubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Aurélien Gâteau <[e-mail]>
-Build-Depends: debhelper (>= 8.0.0~), cmake, kdelibs5-dev, libdbusmenu-qt-dev (>= 0.6.0), pkg-config, libqjson-dev, pkg-kde-tools (>= 0.5.0), libx11-dev
+Build-Depends: debhelper (>= 8.0.0~), cmake, kdelibs5-dev, libdbusmenu-qt-dev (>= 0.6.0), pkg-config, libqjson-dev, pkg-kde-tools (>= 0.5.0), libx11-dev, gnome-icon-theme-full
 Standards-Version: 3.9.1
 Homepage: https://launchpad.net/plasma-widget-menubar
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/plasma-widget-menubar

=== removed directory 'debian/patches'
=== removed file 'debian/patches/kubuntu_01_disable_tests'
--- debian/patches/kubuntu_01_disable_tests	2011-09-12 10:07:37 +0000
+++ debian/patches/kubuntu_01_disable_tests	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Index: plasma-widget-menubar-0.1.16/CMakeLists.txt
-===================================================================
---- plasma-widget-menubar-0.1.16.orig/CMakeLists.txt	2011-09-12 11:33:14.099171392 +0200
-+++ plasma-widget-menubar-0.1.16/CMakeLists.txt	2011-09-12 11:33:20.149171371 +0200
-@@ -22,7 +22,7 @@
-     )
- 
- add_subdirectory(src)
--add_subdirectory(tests)
-+#add_subdirectory(tests)
- 
- # Packaging
- set(PROJECT_VERSION "0.1.16")

=== removed file 'debian/patches/series'
--- debian/patches/series	2011-09-12 10:07:37 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-kubuntu_01_disable_tests

=== modified file 'debian/rules'
--- debian/rules	2011-09-12 10:07:37 +0000
+++ debian/rules	2012-04-04 10:43:42 +0000
@@ -3,7 +3,5 @@
 %:
 	dh $@ --with kde
 
-#disable until test suite actually passes
-#common-post-build-arch::
-#	make -C obj-*/tests buildtests
-#	make -C obj-*/tests test
+override_dh_auto_test:
+	make -C obj-*/tests check