rev 19024 - in kde-extras/digikam/trunk/debian: . patches
Mark Purcell
msp at alioth.debian.org
Sat Dec 17 05:28:43 UTC 2011
Author: msp
Date: 2011-12-17 05:28:42 +0000 (Sat, 17 Dec 2011)
New Revision: 19024
Added:
kde-extras/digikam/trunk/debian/patches/link_qjson.diff
Removed:
kde-extras/digikam/trunk/debian/patches/kubuntu_disable_kvkontakte.diff
Modified:
kde-extras/digikam/trunk/debian/changelog
kde-extras/digikam/trunk/debian/control
kde-extras/digikam/trunk/debian/digikam.install
kde-extras/digikam/trunk/debian/patches/series
kde-extras/digikam/trunk/debian/rules
Log:
* Add link_qjson.diff patch from Yannick
* Fix Vcs-Browser:
Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog 2011-12-17 00:40:44 UTC (rev 19023)
+++ kde-extras/digikam/trunk/debian/changelog 2011-12-17 05:28:42 UTC (rev 19024)
@@ -1,4 +1,4 @@
-digikam (4:2.4.1-1) UNRELEASED; urgency=low
+digikam (4:2.4.1-1) experimental; urgency=low
* New upstream release
@@ -13,11 +13,10 @@
[ 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
+ * Add link_qjson.diff patch from Yannick
+ * Fix Vcs-Browser:
- -- Mark Purcell <msp at debian.org> Sat, 17 Dec 2011 10:06:08 +1100
+ -- Mark Purcell <msp at debian.org> Sat, 17 Dec 2011 14:29:12 +1100
digikam (4:2.3.0-1) experimental; urgency=low
Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control 2011-12-17 00:40:44 UTC (rev 19023)
+++ kde-extras/digikam/trunk/debian/control 2011-12-17 05:28:42 UTC (rev 19024)
@@ -31,7 +31,7 @@
libx11-dev, libxrandr-dev, libexpat1-dev | libexpat-dev
Standards-Version: 3.8.4
Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/digikam/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/digikam/trunk?op=log
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-kde/kde-extras/digikam/trunk/
Homepage: http://www.digikam.org
Package: digikam
Modified: kde-extras/digikam/trunk/debian/digikam.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.install 2011-12-17 00:40:44 UTC (rev 19023)
+++ kde-extras/digikam/trunk/debian/digikam.install 2011-12-17 05:28:42 UTC (rev 19024)
@@ -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/link_qjson.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/link_qjson.diff (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/link_qjson.diff 2011-12-17 05:28:42 UTC (rev 19024)
@@ -0,0 +1,10 @@
+Index: digikam-2.4.1/extra/libkvkontakte/CMakeLists.txt
+===================================================================
+--- digikam-2.4.1.orig/extra/libkvkontakte/CMakeLists.txt 2011-12-05 08:39:58.000000000 +1100
++++ digikam-2.4.1/extra/libkvkontakte/CMakeLists.txt 2011-12-17 15:06:29.000000000 +1100
+@@ -74,3 +74,5 @@
+
+ macro_display_feature_log()
+
++SET_TARGET_PROPERTIES(kvkontakte PROPERTIES LINK_FLAGS -Wl,-lqjson)
++
Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series 2011-12-17 00:40:44 UTC (rev 19023)
+++ kde-extras/digikam/trunk/debian/patches/series 2011-12-17 05:28:42 UTC (rev 19024)
@@ -1,3 +1,3 @@
-kubuntu_disable_kvkontakte.diff
+link_qjson.diff
bashim-fix
highgui_c.h
Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules 2011-12-17 00:40:44 UTC (rev 19023)
+++ kde-extras/digikam/trunk/debian/rules 2011-12-17 05:28:42 UTC (rev 19024)
@@ -3,9 +3,6 @@
%:
dh $@ --with kde --parallel
-override_dh_auto_configure:
- dh_auto_configure -- -DWITH_LIBKVkontakte=FALSE
-
override_dh_installchangelogs:
dh_installchangelogs core/ChangeLog
More information about the pkg-kde-commits
mailing list