rev 18919 - kde-extras/digikam/trunk/debian
Mark Purcell
msp at alioth.debian.org
Sat Sep 3 03:40:11 UTC 2011
Author: msp
Date: 2011-09-03 03:40:09 +0000 (Sat, 03 Sep 2011)
New Revision: 18919
Added:
kde-extras/digikam/trunk/debian/digikam-doc.install
kde-extras/digikam/trunk/debian/digikam.docs
kde-extras/digikam/trunk/debian/kipi-plugins-common.install
kde-extras/digikam/trunk/debian/kipi-plugins.install
kde-extras/digikam/trunk/debian/kipi-plugins.lintian-overrides
Modified:
kde-extras/digikam/trunk/debian/changelog
kde-extras/digikam/trunk/debian/control
kde-extras/digikam/trunk/debian/digikam-data.install
kde-extras/digikam/trunk/debian/digikam.install
kde-extras/digikam/trunk/debian/rules
kde-extras/digikam/trunk/debian/showfoto.install
Log:
* Upstream have now merged the following packages:
- digikam, digikam-doc, kipi-plugins
* Add relevant files to debian/digikam.docs
* digikam 2.0.0 uses features from kdegraphics 4.7 & ships a private
version of the kdegraphics libs - this is not the Debian way :-(
libkipi-dev kdegraphics-libs-data & libkipi8
Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog 2011-08-06 07:10:15 UTC (rev 18918)
+++ kde-extras/digikam/trunk/debian/changelog 2011-09-03 03:40:09 UTC (rev 18919)
@@ -1,14 +1,19 @@
digikam (2:2.0.0-1) experimental; urgency=low
* New upstream release
+ * Upstream have now merged the following packages:
+ - digikam, digikam-doc, kipi-plugins
* Add Build-Depends: libboost-graph-dev, libcv-dev (>= 2.2) - experimental
* Add patches/highgui_c.h to account for different layout
* Add chrpath to strip binary-or-shlib-defines-rpath
* lintian-overrides embedded-library reported upstream:
https://bugs.kde.org/show_bug.cgi?id=237037
+ * Add relevant files to debian/digikam.docs
+ * digikam 2.0.0 uses features from kdegraphics 4.7 & ships a private
+ version of the kdegraphics libs - this is not the Debian way :-(
* Unsatisfactory Conflicts: libkexiv2-dev kipi-plugins-common libkdcraw-dev
- libkipi-dev kdegraphics-libs-data
+ libkipi-dev kdegraphics-libs-data & libkipi8
-- Mark Purcell <msp at debian.org> Sat, 06 Aug 2011 15:58:55 +1000
Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control 2011-08-06 07:10:15 UTC (rev 18918)
+++ kde-extras/digikam/trunk/debian/control 2011-09-03 03:40:09 UTC (rev 18919)
@@ -3,22 +3,31 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Achim Bohnet <ach at mpe.mpg.de>, Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>
-Build-Depends: debhelper (>= 7.2), pkg-kde-tools (>= 0.9), cmake (>= 2.6.2), autotools-dev,
+Build-Depends: debhelper (>= 7.2), pkg-kde-tools (>= 0.9), pkg-config, cmake (>= 2.6.2), autotools-dev,
doxygen,
kdelibs5-dev (>= 4:4.4.4), kdepimlibs5-dev,
+ libqt4-dev, libqt4-opengl-dev, libgl1-mesa-dev, libglu1-mesa-dev,
+ libgphoto2-2-dev,
+ libgtk2.0-dev,
+ libxslt1-dev | libxslt-dev, libxml2-dev,
+ libgpod-nogtk-dev,
+ libqca2-dev,
+ libqjson-dev,
+ libltdl3-dev, libpng-dev, libtiff4-dev, libjpeg-dev,
+ libsane-dev,
shared-desktop-ontologies,
mysql-server-5.1 | mysql-server,
libglib2.0-dev, libgphoto2-2-dev (>= 2.4),
-# libkipi-dev, libkexiv2-dev (>= 4:4.5), libkdcraw-dev (>= 4:4.5),
libmarble-dev (>= 4:4.5),
liblcms1-dev, libtiff4-dev, libpng12-dev, liblqr-1-0-dev,
libcv-dev (>= 2.2), libcvaux-dev (>= 2.2), libopencv-contrib-dev (>= 2.2), libopencv-gpu-dev (>= 2.2),
libjasper-dev,
liblensfun-dev,
libsqlite3-dev,
- libltdl3-dev,
libboost-graph-dev,
- libx11-dev
+ libx11-dev, libxrandr-dev, libexpat1-dev | libexpat-dev,
+# Digikam ships kdegraphics as a private library as it uses KDE SC 4.7 components
+Build-Conflicts: libkipi-dev, libkexiv2-dev (>= 4:4.5), libkdcraw-dev (>= 4:4.5), libksane-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
@@ -28,7 +37,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite, digikam-data (= ${source:Version})
Recommends: www-browser, kipi-plugins, mplayerthumbs
-Conflicts: libkexiv2-dev, kipi-plugins-common, libkdcraw-dev, libkipi-dev, kdegraphics-libs-data
+Conflicts: libkexiv2-dev, libkdcraw-dev, libkipi-dev, kdegraphics-libs-data
Suggests: digikam-doc
Description: digital photo management application for KDE
Digital photo management program designed to import, organize, enhance, search
@@ -64,8 +73,6 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, digikam (= ${binary:Version})
Recommends: dolphin, kipi-plugins
-Conflicts: digikam (<= 2:0.10.0-1ubuntu1)
-Replaces: digikam (<= 2:0.10.0-1ubuntu1)
Description: image viewer/editor for KDE
Showphoto is the standalone image editor of the digiKam project.
.
@@ -84,11 +91,80 @@
Package: digikam-data
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: digikam (<= 2:1.2.0-4)
-Replaces: digikam (<= 2:1.2.0-4)
Description: digikam architecture-independant data
Contains the significant amount of architecture-independent data that is
shipped with digikam.
.
It has been placed in an architecture all file so we do not have
to ship one copy for each architecture.
+
+Package: digikam-doc
+Architecture: all
+Depends: ${misc:Depends}, khelpcenter4
+Recommends: digikam
+Description: handbook for digikam and showfoto in several languages
+ Digikam is an easy to use and powerful digital photo management
+ application.
+ .
+ This package contains the handbooks for digikam, showfoto and
+ kipi-plugins from the digikam package.
+
+Package: kipi-plugins
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, kipi-plugins-common (= ${source:Version})
+Conflicts: libkipi8
+Recommends: graphicsmagick-imagemagick-compat (>= 1.1.7) | imagemagick (>= 5.4.8), konqueror, hugin, enblend, enfuse
+Suggests: gallery, gimp, kmail, vorbis-tools
+Enhances: digikam, gwenview, kphotoalbum, showimg
+Description: image manipulation/handling plugins for KIPI aware programs
+ KIPI plugins (KDE Image Plugin Interface) is an effort to develop a
+ common plugin structure for Digikam, KPhotoAlbum (formerly known as
+ KimDaBa), Showimg and Gwenview.
+ Its aim is to share image plugins among graphic applications.
+ .
+ Current plugins ported to Qt4/KDE4:
+ .
+ AcquireImages : acquire images using flat scanner
+ Calendar : create calendars
+ DngConverter : convert Raw Image to Digital NeGative
+ Facebook : import/export images to a remote Facebook web service
+ FlickrExport : export images to a remote Flickr/23hq web service
+ GalleryExport : export images to a remote Gallery2 server
+ GPSSync : geolocalize pictures
+ HTMLExport : export images collections into a static XHTML
+ ImageViewer : preview images using OpenGL
+ JpegLossLess : rotate/flip images without losing quality
+ MetadataEdit : edit EXIF, IPTC and XMP metadata
+ PicasaWebExport : export images to a remote Picasa web service
+ PrintImage : print images in various format
+ RawConverter : convert Raw Image to JPEG/PNG/TIFF
+ RemoveRedEyes : remove red eyes on image automatically
+ SendImages : send images by e-mail
+ SimpleViewerExport : export images to Flash using SimpleViewer
+ SlideShow : Slide images with 2D and 3D effects using OpenGL
+ Smug : import/export images to a remote SmugMug web service
+ TimeAdjust : adjust date and time
+ IpodExport : export pictures to an Ipod device
+ BatchProcess : batch process images (convert, resize, rename, etc.)
+ KIOExport : export images to remote computer using network protocol
+ Shwup : export images to Shwup web service
+ ExpoBlending : create pseudo HDR image with a stack of bracketed images
+ PiwigoExport : export images to a remote Piwigo (PHPWebGallery) server
+ DebianScreenshots : export images to Debian Screenshots web service (http://screenshots.debian.net).
+ Kopete : export images to an instant messaging contact.
+ .
+ Porting under progress to Qt4/KDE4:
+ .
+ WallPaper : set image as background on your desktop
+ .
+ Not yet ported to Qt4/KDE4:
+ .
+ CDArchiving : archive your image collections to a CD or DVD
+ MpegEncoder : create an MPEG slideshow with a set of images
+
+Package: kipi-plugins-common
+Architecture: all
+Section: graphics
+Depends: ${misc:Depends}
+Description: kipi-plugins architecture-independent data
+ The architecture independent data needed for the kipi-plugins package.
Modified: kde-extras/digikam/trunk/debian/digikam-data.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam-data.install 2011-08-06 07:10:15 UTC (rev 18918)
+++ kde-extras/digikam/trunk/debian/digikam-data.install 2011-09-03 03:40:09 UTC (rev 18919)
@@ -1,4 +1,4 @@
-usr/share/kde4/apps/digikam
+usr/share/kde4/apps/[a-j,l-r]*
usr/share/kde4/apps/solid
-usr/share/kde4/services
+usr/share/kde4/services/digikam*
usr/share/kde4/servicetypes
Added: kde-extras/digikam/trunk/debian/digikam-doc.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam-doc.install (rev 0)
+++ kde-extras/digikam/trunk/debian/digikam-doc.install 2011-09-03 03:40:09 UTC (rev 18919)
@@ -0,0 +1 @@
+usr/share/doc/kde/HTML/en/digikam
Added: kde-extras/digikam/trunk/debian/digikam.docs
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.docs (rev 0)
+++ kde-extras/digikam/trunk/debian/digikam.docs 2011-09-03 03:40:09 UTC (rev 18919)
@@ -0,0 +1,4 @@
+core/AUTHORS
+core/TODO*
+core/NEWS
+core/README*
Modified: kde-extras/digikam/trunk/debian/digikam.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.install 2011-08-06 07:10:15 UTC (rev 18918)
+++ kde-extras/digikam/trunk/debian/digikam.install 2011-09-03 03:40:09 UTC (rev 18919)
@@ -1,8 +1,20 @@
debian/xpm.d/digikam-16.xpm usr/share/pixmaps/
debian/xpm.d/digikam.xpm usr/share/pixmaps/
-usr/bin/cleanup_digikamdb
-usr/bin/digikam
-usr/bin/digitaglinktree
+usr/bin/[a-r]*
+usr/bin/scangui
usr/include
-usr/lib
-usr/share/applications/kde4/digikam.desktop
+usr/lib/libdigikam*
+usr/lib/libkface*
+usr/lib/libkgeomap*
+usr/lib/libmedia*
+usr/lib/kde4/digikam*
+usr/lib/kde4/kio*
+usr/lib/kde4/libexec
+usr/lib/pkgconfig
+usr/share/applications/kde4/[a-r]*
+usr/share/applications/kde4/scangui.desktop
+usr/share/man/man1
+usr/lib/libkexiv2*
+usr/lib/libksane*
+usr/lib/libkdcraw*
+usr/lib/cmake
Added: kde-extras/digikam/trunk/debian/kipi-plugins-common.install
===================================================================
--- kde-extras/digikam/trunk/debian/kipi-plugins-common.install (rev 0)
+++ kde-extras/digikam/trunk/debian/kipi-plugins-common.install 2011-09-03 03:40:09 UTC (rev 18919)
@@ -0,0 +1,6 @@
+usr/share/icons
+usr/share/doc/kde/HTML/en/kipi-plugins
+usr/share/kde4/apps/kipiplugin_*
+usr/share/kde4/services/kipiplugin_*
+usr/share/locale
+usr/share/kde4/apps/kipi
Added: kde-extras/digikam/trunk/debian/kipi-plugins.install
===================================================================
--- kde-extras/digikam/trunk/debian/kipi-plugins.install (rev 0)
+++ kde-extras/digikam/trunk/debian/kipi-plugins.install 2011-09-03 03:40:09 UTC (rev 18919)
@@ -0,0 +1,2 @@
+usr/lib/libkipi*
+usr/lib/kde4/kipi*
Added: kde-extras/digikam/trunk/debian/kipi-plugins.lintian-overrides
===================================================================
--- kde-extras/digikam/trunk/debian/kipi-plugins.lintian-overrides (rev 0)
+++ kde-extras/digikam/trunk/debian/kipi-plugins.lintian-overrides 2011-09-03 03:40:09 UTC (rev 18919)
@@ -0,0 +1,9 @@
+# libkipiplugins.so is no 'proper' shared library. It's contents
+# changes as needed. Upstream does not support any use beside
+# for kipi-plugins Therefore we did not split out a
+# lib and lib-dev pkgs. For further discussion
+# see bug report #324592
+#
+kipi-plugins: no-symbols-control-file
+kipi-plugins: non-dev-pkg-with-shlib-symlink
+kipi-plugins: package-name-doesnt-match-sonames
Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules 2011-08-06 07:10:15 UTC (rev 18918)
+++ kde-extras/digikam/trunk/debian/rules 2011-09-03 03:40:09 UTC (rev 18919)
@@ -1,14 +1,22 @@
#!/usr/bin/make -f
%:
- dh $@ --with kde --parallel
+ dh $@ --parallel
-override_dh_auto_configure:
- dh_auto_configure -- -DWANT_NORPATH:BOOL=1
+# * digikam 2.0.0 uses features from kdegraphics 4.6 ships a private
+# version of the kdegraphics libs - this is not the Debian way :-(
+#
+# The following may work with KDE SC 4.7 :-)
+#
+#override_dh_auto_configure:
+# dh_auto_configure -- -DWANT_NORPATH:BOOL=1 -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS:BOOL=0
override_dh_installchangelogs:
- dh_installchangelogs NEWS
+ dh_installchangelogs core/ChangeLog
+override_dh_install:
+ dh_install --fail-missing
+
override_dh_strip:
dh_strip -a --dbg-package=digikam-dbg
Modified: kde-extras/digikam/trunk/debian/showfoto.install
===================================================================
--- kde-extras/digikam/trunk/debian/showfoto.install 2011-08-06 07:10:15 UTC (rev 18918)
+++ kde-extras/digikam/trunk/debian/showfoto.install 2011-09-03 03:40:09 UTC (rev 18919)
@@ -1,5 +1,6 @@
debian/xpm.d/showfoto-16.xpm usr/share/pixmaps/
debian/xpm.d/showfoto.xpm usr/share/pixmaps/
usr/bin/showfoto
+usr/share/doc/kde/HTML/en/showfoto
usr/share/applications/kde4/showfoto.desktop
usr/share/kde4/apps/showfoto
More information about the pkg-kde-commits
mailing list