rev 19023 - in kde-extras/digikam/trunk/debian: . patches

Mark Purcell msp at alioth.debian.org
Sat Dec 17 00:40:44 UTC 2011


Author: msp
Date: 2011-12-17 00:40:44 +0000 (Sat, 17 Dec 2011)
New Revision: 19023

Added:
   kde-extras/digikam/trunk/debian/patches/kubuntu_disable_kvkontakte.diff
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/digikam.install
   kde-extras/digikam/trunk/debian/patches/series
   kde-extras/digikam/trunk/debian/rules
Log:
* New upstream release
* debian/rules dh_install -XREADME.MACOSX
  - fixes: package-contains-readme-for-other-platform-or-distro
* Add kubuntu_disable_kvkontakte.diff to disable libkvkontakte
  which has compile failures, disable in debian/rules and
  debian/control - thks Jonathan Riddell

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2011-12-10 00:26:58 UTC (rev 19022)
+++ kde-extras/digikam/trunk/debian/changelog	2011-12-17 00:40:44 UTC (rev 19023)
@@ -1,5 +1,7 @@
-digikam (4:2.3.0-2) UNRELEASED; urgency=low
+digikam (4:2.4.1-1) UNRELEASED; urgency=low
 
+  * New upstream release
+
   [ José Manuel Santamaría Lema ]
   * Fix digikam, kipi-plugins, and kipi-plugins-common installed files:
     - In the previous version we were installing in digikam files which belongs
@@ -8,8 +10,15 @@
       (<< 4:2.3.0-2~).
   * Remove duplicate build dependency on libpng12-dev.
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri, 09 Dec 2011 02:47:37 +0100
+  [ Mark Purcell ]
+  * debian/rules dh_install -XREADME.MACOSX
+    - fixes: package-contains-readme-for-other-platform-or-distro
+  * Add kubuntu_disable_kvkontakte.diff to disable libkvkontakte
+    which has compile failures, disable in debian/rules and
+    debian/control - thks Jonathan Riddell
 
+ -- Mark Purcell <msp at debian.org>  Sat, 17 Dec 2011 10:06:08 +1100
+
 digikam (4:2.3.0-1) experimental; urgency=low
 
   * New upstream release

Modified: kde-extras/digikam/trunk/debian/digikam.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.install	2011-12-10 00:26:58 UTC (rev 19022)
+++ kde-extras/digikam/trunk/debian/digikam.install	2011-12-17 00:40:44 UTC (rev 19023)
@@ -13,7 +13,7 @@
 usr/lib/libdigikam*
 usr/lib/libkface*
 usr/lib/libkgeomap*
-usr/lib/libkvkontakte*
+#usr/lib/libkvkontakte*
 usr/lib/libmedia*
 usr/lib/pkgconfig
 usr/share/applications/kde4/digikam.desktop

Added: kde-extras/digikam/trunk/debian/patches/kubuntu_disable_kvkontakte.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/kubuntu_disable_kvkontakte.diff	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/kubuntu_disable_kvkontakte.diff	2011-12-17 00:40:44 UTC (rev 19023)
@@ -0,0 +1,13 @@
+Index: digikam-2.4.1/extra/CMakeLists.txt
+===================================================================
+--- digikam-2.4.1.orig/extra/CMakeLists.txt	2011-12-05 08:40:07.000000000 +1100
++++ digikam-2.4.1/extra/CMakeLists.txt	2011-12-17 10:03:11.000000000 +1100
+@@ -33,7 +33,7 @@
+ ENDIF()
+ 
+ MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki)
+-MACRO_OPTIONAL_ADD_SUBDIRECTORY(libkvkontakte)
++#MACRO_OPTIONAL_ADD_SUBDIRECTORY(libkvkontakte)
+ 
+ ADD_SUBDIRECTORY(libkgeomap)
+ ADD_SUBDIRECTORY(libkface)

Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series	2011-12-10 00:26:58 UTC (rev 19022)
+++ kde-extras/digikam/trunk/debian/patches/series	2011-12-17 00:40:44 UTC (rev 19023)
@@ -1,2 +1,3 @@
+kubuntu_disable_kvkontakte.diff
 bashim-fix
 highgui_c.h

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2011-12-10 00:26:58 UTC (rev 19022)
+++ kde-extras/digikam/trunk/debian/rules	2011-12-17 00:40:44 UTC (rev 19023)
@@ -1,16 +1,17 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --parallel
+	dh $@ --with kde --parallel 
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DWITH_LIBKVkontakte=FALSE
+
 override_dh_installchangelogs:
 	dh_installchangelogs core/ChangeLog 
 
+# conflicts with oxygen-icon-theme package
 override_dh_install:
-	dh_install -Xoxygen --fail-missing
+	dh_install -Xoxygen -XREADME.MACOSX --fail-missing
 
 override_dh_strip:
 	dh_strip -a --dbg-package=digikam-dbg
-
-	# fix binary-or-shlib-defines-rpath
-	chrpath -d debian/digikam/usr/lib/kde4/*.so debian/digikam/usr/lib/*.so.*




More information about the pkg-kde-commits mailing list