Merge lp:~rohangarg/kubuntu-packaging/digikam into lp:~kubuntu-packagers/kubuntu-packaging/digikam

[Rohan Garg]

Digikam 2.1.1 packaging

[Harald Sitter (apachelogger)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-27 19:14:59 +0000
+++ debian/changelog	2011-09-18 16:42:34 +0000
@@ -1,6 +1,16 @@
-digikam (2:2.0.0-0ubuntu1) UNRELEASED; urgency=low
-
-  * New upstream release (LP: #781128)
+digikam (2:2.1.1-0ubuntu1) UNRELEASED; urgency=low
+
+  [ Rohan Garg ]
+  * New upstream release (LP: #834190)
+    - debian/control
+      + Build with libqtwebkit-dev
+   - debian/kipi-plugins-common
+      + Install libkvkontakte required by kipi-plugins
+   - debian/digikam
+      + Install panoramagui
+
+  [ Philip Muškovac ]
+  * New upstream release
     - debian/control: 
       + Add libcv-dev, libcvaux-dev, libhighgui-dev, libboost-graph1.46-dev,
         libksane-dev, libxml2-dev, libxslt-dev, libqt4-opengl-dev, libqjson-dev,
@@ -15,7 +25,7 @@
   * Fix typo in digikam-data description (LP: #804894)
   * Fix Vcs links
 
- -- Philip Muškovac <[e-mail]>  Wed, 24 Aug 2011 16:13:58 +0200
+ -- Rohan Garg <[e-mail]>  Fri, 16 Sep 2011 17:29:37 +0530
 
 digikam (2:1.9.0-1ubuntu2) oneiric; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2011-08-27 19:14:59 +0000
+++ debian/control	2011-09-18 16:42:34 +0000
@@ -27,7 +27,8 @@
  libqt4-opengl-dev,
  libqjson-dev,
  libgpod-dev,
- libqca2-dev
+ libqca2-dev,
+ libqtwebkit-dev
 Standards-Version: 3.8.4
 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/digikam
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/digikam

=== modified file 'debian/digikam-data.install'
--- debian/digikam-data.install	2011-08-27 19:14:59 +0000
+++ debian/digikam-data.install	2011-09-18 16:42:34 +0000
@@ -4,3 +4,7 @@
 usr/share/kde4/servicetypes/digikamimageplugin.desktop
 usr/share/doc/kde/HTML/en/digikam/*
 usr/share/locale/*/LC_MESSAGES/digikam.mo
+usr/share/icons/hicolor/16x16/actions/panorama.png
+usr/share/icons/hicolor/22x22/actions/panorama.png
+usr/share/icons/hicolor/32x32/actions/panorama.png
+usr/share/icons/hicolor/48x48/actions/panorama.png

=== modified file 'debian/digikam.install'
--- debian/digikam.install	2011-08-27 19:14:59 +0000
+++ debian/digikam.install	2011-09-18 16:42:34 +0000
@@ -3,6 +3,7 @@
 usr/bin/cleanup_digikamdb
 usr/bin/digikam
 usr/bin/digitaglinktree
+usr/bin/panoramagui
 usr/lib/libdigikamcore.so.*
 usr/lib/libdigikamdatabase.so.*
 usr/lib/kde4/libexec/digikamdatabaseserver
@@ -10,3 +11,4 @@
 usr/lib/kde4/kio_digikam*
 usr/lib/kde4/digikamnepomukservice.so
 usr/share/applications/kde4/digikam.desktop
+usr/share/applications/kde4/panoramagui.desktop

=== modified file 'debian/kipi-plugins.install'
--- debian/kipi-plugins.install	2011-08-27 19:14:59 +0000
+++ debian/kipi-plugins.install	2011-09-18 16:42:34 +0000
@@ -8,3 +8,6 @@
 usr/share/applications/kde4/expoblending.desktop
 usr/share/applications/kde4/scangui.desktop
 usr/share/applications/kde4/dngconverter.desktop
+usr/lib/libkvkontakte.so
+usr/lib/libkvkontakte.so.1
+usr/lib/libkvkontakte.so.1.0.0

=== modified file 'debian/not-installed'
--- debian/not-installed	2011-08-27 19:14:59 +0000
+++ debian/not-installed	2011-09-18 16:42:34 +0000
@@ -22,3 +22,40 @@
 # compressed manpages
 ./usr/share/man/man1/cleanup_digikamdb.1
 ./usr/share/man/man1/digitaglinktree.1
+
+# devel headers not required
+./usr/include/libkvkontakte/albuminfo.h
+./usr/include/libkvkontakte/albumlistjob.h
+./usr/include/libkvkontakte/allmessageslistjob.h
+./usr/include/libkvkontakte/allnoteslistjob.h
+./usr/include/libkvkontakte/authenticationdialog.h
+./usr/include/libkvkontakte/cidsnamesjob.h
+./usr/include/libkvkontakte/createalbumjob.h
+./usr/include/libkvkontakte/deletealbumjob.h
+./usr/include/libkvkontakte/discussionslistjob.h
+./usr/include/libkvkontakte/editalbumjob.h
+./usr/include/libkvkontakte/friendlistjob.h
+./usr/include/libkvkontakte/getapplicationpermissionsjob.h
+./usr/include/libkvkontakte/getinfojob.h
+./usr/include/libkvkontakte/getvariablejob.h
+./usr/include/libkvkontakte/libkvkontakte_export.h
+./usr/include/libkvkontakte/messageinfo.h
+./usr/include/libkvkontakte/messageslistjob.h
+./usr/include/libkvkontakte/noteaddjob.h
+./usr/include/libkvkontakte/noteinfo.h
+./usr/include/libkvkontakte/notejob.h
+./usr/include/libkvkontakte/noteslistjob.h
+./usr/include/libkvkontakte/photoinfo.h
+./usr/include/libkvkontakte/photojob.h
+./usr/include/libkvkontakte/photolistjob.h
+./usr/include/libkvkontakte/qintlist.h
+./usr/include/libkvkontakte/uploadphotosjob.h
+./usr/include/libkvkontakte/userinfo.h
+./usr/include/libkvkontakte/userinfofulljob.h
+./usr/include/libkvkontakte/userinfojob.h
+./usr/include/libkvkontakte/version.h
+./usr/include/libkvkontakte/vkontaktejobs.h
+./usr/lib/cmake/LibKVkontakte/LibKVkontakteConfig.cmake
+./usr/lib/cmake/LibKVkontakte/LibKVkontakteConfigVersion.cmake
+./usr/lib/cmake/LibKVkontakte/LibKVkontakteTargetsrelwithdebinfo.cmake
+./usr/lib/cmake/LibKVkontakte/LibKVkontakteTargets.cmake