rev 20595 - in kde-extras/digikam/trunk/debian: . patches
Steven Michael Robbins
smr at moszumanska.debian.org
Sun Jul 10 01:06:45 UTC 2016
Author: smr
Date: 2016-07-10 01:06:44 +0000 (Sun, 10 Jul 2016)
New Revision: 20595
Added:
kde-extras/digikam/trunk/debian/digikam-private-libs.install
kde-extras/digikam/trunk/debian/kipi-plugins-common.install
kde-extras/digikam/trunk/debian/kipi-plugins.docs
kde-extras/digikam/trunk/debian/kipi-plugins.install
kde-extras/digikam/trunk/debian/patches/cmake-disable-doc-translated-showfoto.patch
Removed:
kde-extras/digikam/trunk/debian/digikam-private-libs.install
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-doc.install
kde-extras/digikam/trunk/debian/digikam.docs
kde-extras/digikam/trunk/debian/digikam.install
kde-extras/digikam/trunk/debian/patches/cmake-disable-jasper.patch
kde-extras/digikam/trunk/debian/patches/series
kde-extras/digikam/trunk/debian/rules
kde-extras/digikam/trunk/debian/showfoto.install
Log:
Update to build the released 5.0.0 tarball.
Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog 2016-07-07 08:34:31 UTC (rev 20594)
+++ kde-extras/digikam/trunk/debian/changelog 2016-07-10 01:06:44 UTC (rev 20595)
@@ -1,11 +1,9 @@
-digikam (4:5.0.0~git20160703-1) experimental; urgency=medium
+digikam (4:5.0.0-1) experimental; urgency=medium
- * Staging the upcoming 5.0.0 release.
+ * Staging the 5.0.0 release.
- Updated all build-depends.
- - Remove obsolete cmake flags DIGIKAMSC_COMPILE_*, ENABLE_LCMS2,
+ - Remove obsolete cmake flags DIGIKAMSC_COMPILE_LIBKFACE, ENABLE_LCMS2,
KDE4_BUILD_TESTS.
- - Remove packages kipi-plugins, kipi-plugins-common: KIPI plugins
- are now distributed from a separate source tree.
* Update patches.
- doc-linkage.patch:
@@ -17,7 +15,7 @@
- cmake-disable-jasper.patch: New. Disable build-time probe
for Jasper libraries.
- -- Steve M. Robbins <smr at debian.org> Sun, 03 Jul 2016 21:06:28 -0500
+ -- Steve M. Robbins <smr at debian.org> Tue, 05 Jul 2016 22:23:29 -0500
digikam (4:4.14.0-4) unstable; urgency=medium
Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control 2016-07-07 08:34:31 UTC (rev 20594)
+++ kde-extras/digikam/trunk/debian/control 2016-07-10 01:06:44 UTC (rev 20595)
@@ -17,8 +17,10 @@
libqt5opengl5-dev,
libkf5sane-dev,
libkf5threadweaver-dev,
+ libqt5svg5-dev,
libqt5webkit5-dev,
libqt5x11extras5-dev,
+ libqt5xmlpatterns5-dev,
libexiv2-dev,
libjpeg-dev,
libtiff-dev,
@@ -42,9 +44,12 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: private libraries for digiKam and showfoto
+Description: private libraries for digiKam and kipi plugins
This package contains private libraries to be used by digikam and
- showfoto.
+ kipi-plugins.
+ .
+ This has no use for anything else than digikam, since the libraries are
+ installed in a private library path.
Package: digikam
Architecture: any
@@ -80,6 +85,26 @@
supports RAW format conversion through libraw, DNG export and ICC color
management work flow.
.
+ New Features of the KDE4 version:
+ Runs on any platform that supports Qt4 and KDE4
+ Supports XMP metadata
+ Reads, writes and converts into DNG format
+ New RAW processing tool, gamma-correction in 16 bits
+ Preview of video and audio files
+ Database file is independent of photo libraries, enabling remote paths,
+ multiple roots and offline archives
+ Improved database with many more metadata that can be searched
+ Marble integration, geographical filtering with the mouse on the map
+ New search finds duplicates and similar images
+ Help menu lists all RAW formats and digiKam component versions
+ DNG, RWL, NEF and PEF RAW file can be metadata edited
+ Usability improvements for netbooks
+ Non-modal image editor
+ Thumbnail bar in preview mode
+ Live search boxes in both sidebars and main window
+ New camera interface, capture tool, scanner interface
+ New plugin based on lensfun for automatic lens error corrections
+ .
digiKam can also make use of the KIPI image handling plugins to
extend its capabilities even further for photo manipulations,
import and export, etc. The kipi-plugins package contains many
@@ -87,8 +112,8 @@
Package: showfoto
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, digikam-data (= ${binary:Version}), digikam-private-libs (= ${binary:Version})
-Recommends: dolphin
+Depends: ${shlibs:Depends}, ${misc:Depends}, digikam-private-libs (= ${binary:Version})
+Recommends: dolphin, kipi-plugins
Breaks: digikam-doc (<< 2:2.0.0-1), kipi-plugins-common (<< 4:3.1.0-2~)
Replaces: digikam-doc (<< 2:2.0.0-1), kipi-plugins-common (<< 4:3.1.0-2~)
Description: image viewer/editor for KDE
@@ -112,11 +137,88 @@
Package: digikam-doc
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, khelpcenter4
Recommends: digikam
Section: doc
Description: handbook for digiKam
digiKam is an easy to use and powerful digital photo management
application.
.
- This package contains the handbook for digiKam.
+ This package contains the handbooks for digiKam and kipi-plugins.
+
+Package: kipi-plugins
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, kipi-plugins-common (= ${source:Version}),
+ digikam-private-libs (= ${binary:Version})
+Breaks: digikam (<< 4:2.3.0-2~), kipi-plugins-common (<< 4:3.1.0-2~)
+Replaces: digikam (<< 4:2.3.0-2~), kipi-plugins-common (<< 4:3.1.0-2~)
+Recommends: konqueror, imagemagick, hugin, enblend, enfuse, minidlna
+Suggests: 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/from a remote Facebook
+ FlickrExport : export images to a remote Flickr based web service
+ GalleryExport : export images to a remote Gallery (and Gallery 2)
+ GPSSync : geolocalize pictures
+ HTMLExport : export images collections into a static XHTML page
+ 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/from a remote SmugMug
+ 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
+ DebianScreenshots : export images to Debian Screenshots web service
+ Kopete : export images to an instant messaging contact
+ YandexFotki : export images to Yandex web service
+ MediaWiki : export images to Mediawiki based web service
+ RajceExport : export images to Rajce web service
+ Vkontakte : export images to VKontakte web service
+ PhotoLayoutEditor : assemble images together
+ ImageShackExport : export images to ImageShack web service
+ ImgurExport : export images to ImgUr web service
+ DLNAExport : export collection on DLNA network service
+ .
+ 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
+Depends: ${misc:Depends}
+Breaks: digikam (<< 4:2.3.0-2~), digikam-data (<< 4:3.1.0-2~)
+Replaces: digikam (<< 4:2.3.0-2~), digikam-data (<< 4:3.1.0-2~)
+Conflicts: ${digikam:Conflicts}
+Description: kipi-plugins architecture-independent data
+ 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.
+ .
+ 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 2016-07-07 08:34:31 UTC (rev 20594)
+++ kde-extras/digikam/trunk/debian/digikam-data.install 2016-07-10 01:06:44 UTC (rev 20595)
@@ -1,8 +1,10 @@
+usr/share/icons/hicolor/*/apps/digikam.*
+usr/share/icons/hicolor/*/apps/expoblending.*
+usr/share/icons/hicolor/*/apps/panorama.*
+usr/share/icons/hicolor/*/actions
usr/share/digikam
-usr/share/icons
-usr/share/kconf_update
-usr/share/knotifications5
-usr/share/kservices5
-usr/share/kservicetypes5
+usr/share/solid
+usr/share/kservice*/digikam*
usr/share/kxmlgui5/digikam
-usr/share/solid
+usr/share/knotifications5/digikam*
+usr/share/locale/*/LC_MESSAGES/digikam.mo
Modified: kde-extras/digikam/trunk/debian/digikam-doc.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam-doc.install 2016-07-07 08:34:31 UTC (rev 20594)
+++ kde-extras/digikam/trunk/debian/digikam-doc.install 2016-07-10 01:06:44 UTC (rev 20595)
@@ -1 +1 @@
-
+usr/share/doc/HTML/*/digikam
Copied: kde-extras/digikam/trunk/debian/digikam-private-libs.install (from rev 20546, kde-extras/digikam/trunk/debian/digikam-private-libs.install)
===================================================================
--- kde-extras/digikam/trunk/debian/digikam-private-libs.install (rev 0)
+++ kde-extras/digikam/trunk/debian/digikam-private-libs.install 2016-07-10 01:06:44 UTC (rev 20595)
@@ -0,0 +1 @@
+usr/lib/*/libdigikam*.so.* usr/lib/digikam/
Modified: kde-extras/digikam/trunk/debian/digikam.docs
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.docs 2016-07-07 08:34:31 UTC (rev 20594)
+++ kde-extras/digikam/trunk/debian/digikam.docs 2016-07-10 01:06:44 UTC (rev 20595)
@@ -1,4 +1,4 @@
-AUTHORS
-TODO*
-NEWS
-README*
+core/AUTHORS
+core/TODO*
+core/NEWS
+core/README*
Modified: kde-extras/digikam/trunk/debian/digikam.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.install 2016-07-07 08:34:31 UTC (rev 20594)
+++ kde-extras/digikam/trunk/debian/digikam.install 2016-07-10 01:06:44 UTC (rev 20595)
@@ -1,8 +1,10 @@
usr/bin/cleanup_digikamdb
usr/bin/digikam
usr/bin/digitaglinktree
+usr/lib/*/qt5/plugins/digikam*
usr/share/appdata/digikam.appdata.xml
usr/share/appdata/digiKam-*.metainfo.xml
usr/share/applications/digikam.desktop
+usr/share/kconf_update/
usr/share/man/man1/cleanup_digikamdb.1
usr/share/man/man1/digitaglinktree.1
Copied: kde-extras/digikam/trunk/debian/kipi-plugins-common.install (from rev 20546, 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 2016-07-10 01:06:44 UTC (rev 20595)
@@ -0,0 +1,6 @@
+usr/share/doc/HTML/en/kipi-plugins
+usr/share/icons/hicolor/*/apps/kipi*
+usr/share/kxmlgui5/kipi
+usr/share/kipiplugin_*
+usr/share/locale/*/LC_MESSAGES/kipiplugin*
+usr/share/locale/*/LC_MESSAGES/libkvkontakte.mo
Copied: kde-extras/digikam/trunk/debian/kipi-plugins.docs (from rev 20546, kde-extras/digikam/trunk/debian/kipi-plugins.docs)
===================================================================
--- kde-extras/digikam/trunk/debian/kipi-plugins.docs (rev 0)
+++ kde-extras/digikam/trunk/debian/kipi-plugins.docs 2016-07-10 01:06:44 UTC (rev 20595)
@@ -0,0 +1,2 @@
+extra/kipi-plugins/AUTHORS
+extra/kipi-plugins/NEWS
Copied: kde-extras/digikam/trunk/debian/kipi-plugins.install (from rev 20546, 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 2016-07-10 01:06:44 UTC (rev 20595)
@@ -0,0 +1,4 @@
+usr/lib/*/qt5/plugins/kipi*
+usr/lib/*/*kipiplugins.so.* usr/lib/digikam/
+usr/share/applications/kipiplugins.desktop
+usr/share/kservices5/kipiplugin_*
Added: kde-extras/digikam/trunk/debian/patches/cmake-disable-doc-translated-showfoto.patch
===================================================================
--- kde-extras/digikam/trunk/debian/patches/cmake-disable-doc-translated-showfoto.patch (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/cmake-disable-doc-translated-showfoto.patch 2016-07-10 01:06:44 UTC (rev 20595)
@@ -0,0 +1,9 @@
+Temporary workaround to allow building without translated shofoto docs.
+See upstream bug https://bugs.kde.org/show_bug.cgi?id=365135
+
+--- digikam-5.0.0.orig/doc-translated/digikam/CMakeLists.txt
++++ digikam-5.0.0/doc-translated/digikam/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_subdirectory(digikam)
+-add_subdirectory(showfoto)
++#add_subdirectory(showfoto)
Modified: kde-extras/digikam/trunk/debian/patches/cmake-disable-jasper.patch
===================================================================
--- kde-extras/digikam/trunk/debian/patches/cmake-disable-jasper.patch 2016-07-07 08:34:31 UTC (rev 20594)
+++ kde-extras/digikam/trunk/debian/patches/cmake-disable-jasper.patch 2016-07-10 01:06:44 UTC (rev 20595)
@@ -8,8 +8,8 @@
---- digikam-5.0.0~git20160625.orig/CMakeLists.txt
-+++ digikam-5.0.0~git20160625/CMakeLists.txt
+--- digikam-5.0.0~git20160625.orig/core/CMakeLists.txt
++++ digikam-5.0.0~git20160625/core/CMakeLists.txt
@@ -267,7 +267,7 @@
find_package(Marble)
Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series 2016-07-07 08:34:31 UTC (rev 20594)
+++ kde-extras/digikam/trunk/debian/patches/series 2016-07-10 01:06:44 UTC (rev 20595)
@@ -1 +1,2 @@
+cmake-disable-doc-translated-showfoto.patch
cmake-disable-jasper.patch
Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules 2016-07-07 08:34:31 UTC (rev 20594)
+++ kde-extras/digikam/trunk/debian/rules 2016-07-10 01:06:44 UTC (rev 20595)
@@ -1,7 +1,10 @@
#!/usr/bin/make -f
+PRIVATE_LIBDIR := /usr/lib/digikam
export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+# The following was previously used when building with local libkipi, libkexiv2, and libkdcraw implementation
+#CONFLICTS_SUBSTVAR := libkipi-data, libkexiv2-data, libkdcraw-data, libksane-data
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -12,18 +15,45 @@
dh $@ --with kde --parallel
override_dh_auto_configure:
+ ln -s -n -f ../libkface15083 extra/libkface
dh_auto_configure --buildsystem=kde -- \
+ -DCMAKE_INSTALL_RPATH="$(PRIVATE_LIBDIR)" \
+ -DDIGIKAMSC_COMPILE_DOC=on \
+ -DDIGIKAMSC_COMPILE_PO=on \
-DENABLE_MYSQLSUPPORT=ON \
-DENABLE_INTERNALMYSQL=ON
override_dh_auto_install:
dh_auto_install
# remove development stuff: headers, cmake config files, pkg-config files, .so symlinks, static libs
+ rm -rf --verbose debian/tmp/usr/include
+ rm -rf --verbose debian/tmp/usr/share/kde4/apps/cmake
+ rm -rf --verbose debian/tmp/usr/lib/cmake
+ rm -rf --verbose debian/tmp/usr/lib/pkgconfig
find debian/tmp/usr/lib -type l -name '*.so' -exec rm --verbose {} \;
+ # remove potentially conflicting oxygen icons in global icon theme
+ rm -rf --verbose debian/tmp/usr/share/icons/oxygen
+ # remove libkipi translations, provided by kde-l10n-*
+ rm -rf --verbose debian/tmp/usr/share/locale/*/LC_MESSAGES/libkipi.mo
+ # remove haar cascades, the versions in opencv-data will be used instead
+ rm -rf --verbose debian/tmp/usr/share/kde4/apps/libkface/haarcascades
+override_dh_installchangelogs:
+ dh_installchangelogs -pdigikam core/ChangeLog
+ dh_installchangelogs -pkipi-plugins extra/kipi-plugins/ChangeLog
+ dh_installchangelogs --remaining-packages
+
override_dh_install:
dh_install --fail-missing
- find debian/digikam-data/usr/share/icons -iname '*showfoto*' | xargs rm
+ # remove duplicate libkipiplugins copied also in digikam-private-libs
+ rm -f --verbose debian/digikam-private-libs/$(PRIVATE_LIBDIR)/libkipiplugins.so.*
+override_dh_shlibdeps:
+ dh_shlibdeps -l$(CURDIR)/debian/digikam-private-libs/$(PRIVATE_LIBDIR):$(CURDIR)/debian/kipi-plugins/$(PRIVATE_LIBDIR)
+
+override_dh_gencontrol:
+ dh_gencontrol -- -Vdigikam:Conflicts='$(CONFLICTS_SUBSTVAR)'
+
# auto tests require user interaction - override
override_dh_auto_test:
+
Modified: kde-extras/digikam/trunk/debian/showfoto.install
===================================================================
--- kde-extras/digikam/trunk/debian/showfoto.install 2016-07-07 08:34:31 UTC (rev 20594)
+++ kde-extras/digikam/trunk/debian/showfoto.install 2016-07-10 01:06:44 UTC (rev 20595)
@@ -1,6 +1,7 @@
usr/bin/showfoto
usr/share/appdata/showfoto.appdata.xml
usr/share/applications/showfoto.desktop
+usr/share/doc/HTML/en/showfoto
+usr/share/icons/hicolor/*/apps/showfoto.*
+usr/share/kxmlgui5/showfoto
usr/share/showfoto
-usr/share/kxmlgui5/showfoto
-usr/share/icons/hicolor/*/apps/showfoto.*
More information about the pkg-kde-commits
mailing list