rev 18885 - in kde-extras/kphotoalbum/tags: . 4.1.1-4/debian 4.1.1-4/debian/patches
Scott Kitterman
kitterman at alioth.debian.org
Mon May 30 01:42:06 UTC 2011
Author: kitterman
Date: 2011-05-30 01:42:05 +0000 (Mon, 30 May 2011)
New Revision: 18885
Added:
kde-extras/kphotoalbum/tags/4.1.1-4/
kde-extras/kphotoalbum/tags/4.1.1-4/debian/changelog
kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/debian-changes-4.1.1-3
kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/fedora-docbook-fix.diff
kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/series
kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/ubuntu-exiv2-0.21.diff
Removed:
kde-extras/kphotoalbum/tags/4.1.1-4/debian/changelog
kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/series
Log:
[svn-buildpackage] Tagging kphotoalbum 4.1.1-4
Copied: kde-extras/kphotoalbum/tags/4.1.1-4/debian/changelog (from rev 18884, kde-extras/kphotoalbum/trunk/debian/changelog)
===================================================================
--- kde-extras/kphotoalbum/tags/4.1.1-4/debian/changelog (rev 0)
+++ kde-extras/kphotoalbum/tags/4.1.1-4/debian/changelog 2011-05-30 01:42:05 UTC (rev 18885)
@@ -0,0 +1,262 @@
+kphotoalbum (4.1.1-4) unstable; urgency=low
+
+ * Team Upload
+
+ [ Scott Kitterman ]
+ * Feedback changes from Ubuntu:
+ - Add patch from Fedora to fix docbook format for 4.1.2-dtd transition
+ (Closes: #628538)
+ - Add change from upstream to fix build with exiv2 0.21 (change will make
+ kphotoalbum binNMUable when 0.21 is moved from Experimental to Unstable)
+ - Update debian/control: add shared-desktop-ontologies build dependency
+
+ [ Fathi Boudra ]
+ * Update debian/control: bump build dependencies.
+ * Update debian/rules:
+ - enable parallel build (pass --parallel option to dh).
+ - remove override_dh_compress - not needed anymore.
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 29 May 2011 20:45:23 -0400
+
+kphotoalbum (4.1.1-3) unstable; urgency=low
+
+ * Update Build-Depends for KDE SC 4.4.3 (Closes: #579986)
+
+ -- Mark Purcell <msp at debian.org> Mon, 03 May 2010 20:15:11 +1000
+
+kphotoalbum (4.1.1-2) unstable; urgency=low
+
+ * Add stable branch pull patch from KDE svn:
+ - Remove of some code that became dead with yesterdays bugfix
+ - fixed bug #220373: Viewer settings dialog did not load correct
+ values and had wrong defaults. (Closes: #563821)
+ - fixed bug #220376: Shortcuts in the annotation dialog was broken
+ in some translations
+ - bugfix: KPA crashes when viewing images if viewer cache size is set to
+ zero
+ - fixed bug #211907: Fix EXIF support dialog at startup.
+ - fixed bug #147891: Crashing on wrong export directory in Plugin interface
+ * Switch to dpkg-source 3.0 (quilt) format.
+ * Update debian/control:
+ - Bump Standards-Version to 3.8.3 (no changes needed).
+ * Update debian/rules:
+ - Use kde sequence addon.
+
+ -- Fathi Boudra <fabo at debian.org> Thu, 14 Jan 2010 10:12:27 +0100
+
+kphotoalbum (4.1.1-1) unstable; urgency=low
+
+ * New upstream release.
+ - Fixes "Missing EXIF support dialog". (Closes: #552236)
+ - Fixes "Picture counter on timeline". (Closes: #535094)
+ * Fixup debian/watch.
+ * Fix "English help files are missing"
+ - Add missing doc/CMakeLists.txt (Closes: #557141)
+
+ -- Mark Purcell <msp at debian.org> Sun, 27 Dec 2009 22:01:46 +1100
+
+kphotoalbum (4.0.2-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #538061)
+ * Update debian/control:
+ - Remove cdbs build dependency
+ - Bump Standards-Version to 3.8.2 (no changes needed)
+ * Rewrite debian/rules: use dh.
+
+ -- Fathi Boudra <fabo at debian.org> Thu, 30 Jul 2009 14:28:40 +0200
+
+kphotoalbum (4.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+ - debian/patches/00_kphotoalbum_r967963.diff & quilt obsolete
+
+ -- Mark Purcell <msp at debian.org> Sun, 24 May 2009 16:48:14 +1000
+
+kphotoalbum (4.0-2) unstable; urgency=low
+
+ * Add branch pull patch from r967963:
+ - BUGFIX: The HTML generator did not display the available themes
+ correctly.
+ - BUGFIX: Invoke external application for multiple files did not work.
+ - BUGFIX: build failure on armel architecture.
+ * Add quilt build dependency and related CDBS include.
+
+ -- Fathi Boudra <fabo at debian.org> Mon, 18 May 2009 12:42:48 +0200
+
+kphotoalbum (4.0-1) unstable; urgency=low
+
+ * New upstream release
+ - dialog layout code rewrite (Closes: #451330).
+ - Initial KDE 4 version (Closes: #507235).
+
+ [ Fathi Boudra ]
+ * Remove patches (not needed).
+ * Bump compat to 7.
+ * Update debian/control:
+ - Switch from kde section to graphics.
+ - Remove quilt and libkexif1-dev build dependencies.
+ - Bump debhelper to 7.
+ - Add cmake and pkg-kde-tools build dependencies.
+ - Bump libexiv2 buil dependency to 0.18.
+ - Replace libkdcraw-dev build dependency by libkdcraw7-dev.
+ - Replace libkipi0-dev build dependency by libkipi6-dev.
+ - Add libjpeg62-dev, libmarble-dev and x11proto-core-dev build
+ dependencies.
+ - Bump Standards-Version from 3.7.3 to 3.8.1 (no changes needed).
+ - Replace libqt3-mt-sqlitea nd sqlite dependencies by libqt4-sql-sqlite.
+ - Remove deprecated kimdaba conflicts/replaces/provides.
+ - Add mplayerthumbs suggests.
+ * Update debian/copyright:
+ - Remove Dave Coffin.
+ - Add Henner Zeller.
+ - Update GPL version and years.
+ * Update debian/rules:
+ - Use pkg-kde-tools kde.mk.
+ - Remove patchsys-quilt.pk (not used).
+
+ [ Mark Purcell ]
+ * Refresh debian/watch
+
+ -- Fathi Boudra <fabo at debian.org> Tue, 12 May 2009 10:15:39 +0200
+
+kphotoalbum (3.1.1-2) unstable; urgency=low
+
+ * Add typeinfo include before using typeid. (Closes: #474355)
+
+ -- Fathi Boudra <fabo at debian.org> Sat, 05 Apr 2008 21:00:40 +0200
+
+kphotoalbum (3.1.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Merge Ubuntu changes:
+ * Add khelpcenter recommends.
+ * Bump libexiv2-dev, libkdcraw-dev and libkexif1-dev build dependencies.
+ * Add Vcs-Browser and Vcs-Svn fields.
+
+ -- Fathi Boudra <fabo at debian.org> Tue, 25 Mar 2008 23:10:58 +0100
+
+kphotoalbum (3.1.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update my e-mail address.
+ * Bump Standards-Version to 3.7.3.
+ * Use Homepage field.
+ * Add libkdcraw-dev build dependency.
+ * Replace Apps by Applications in menu file.
+ * Switch to quilt patch system.
+ * Build with --as-needed linker flag.
+ * Add patch to fix typo in translation. (Closes: #430702)
+
+ -- Fathi Boudra <fabo at debian.org> Fri, 14 Dec 2007 22:42:58 +0100
+
+kphotoalbum (3.0.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Tue, 24 Apr 2007 06:57:07 +1000
+
+kphotoalbum (3.0-2) unstable; urgency=low
+
+ * Update debian/watch
+
+ -- Mark Purcell <msp at debian.org> Thu, 29 Mar 2007 22:17:18 +0100
+
+kphotoalbum (3.0-1) experimental; urgency=low
+
+ * New upstream release
+ * Remove autoconf 2.60 support patch, merged upstream
+ * control: add libqt3-mt-sqlite and sqlite to depends
+ * copyright: updated
+
+ -- Fathi Boudra <fboudra at free.fr> Wed, 3 Jan 2007 08:37:00 +0100
+
+kphotoalbum (2.2-2) unstable; urgency=low
+
+ * Add version to libexiv2 dependency (Closes: #386855)
+
+ -- Fathi Boudra <fboudra at free.fr> Mon, 11 Sep 2006 00:07:52 +0200
+
+kphotoalbum (2.2-1) unstable; urgency=low
+
+ * New upstream release (Closes: #370136, #351170)
+ * Convert package to cdbs (Closes: #364371, #332754)
+ * New maintainers:
+ * Maintainer: KDE Extras Team
+ * Uploaders: Mark Purcell and Fathi Boudra
+ * compat: bumped to 5
+ * control:
+ * renamed KimDaBa to KPhotoAlbum
+ * replaced Section graphics by kde
+ * removed unneeded Build-depends
+ * bumped Standards-Version to 3.7.2
+ * removed kdegraphics from recommend (Closes: #346391)
+ * updated description (Closes: #364160)
+ * added Conflicts/Replaces KimDaBa
+ * copyright: added missing copyrights
+ * manpage and menu updated according to kphotoalbum name
+ * watch file added
+
+ -- Fathi Boudra <fboudra at free.fr> Wed, 30 Aug 2006 13:36:01 +0200
+
+kimdaba (2.1-1) unstable; urgency=low
+
+ * New upstream release, (closes: #316861, #314689).
+ * Adapted to follow new version (3.6.2) of the Debian Policy.
+ * Build-depends cleanup. Thanks to Ubuntu developer Jonathan Riddell
+ <jr at jriddell.org> and Debian Developers Adeodato Simó <asp16 at alu.ua.es>
+ and Steve Langasek <vorlon at debian.org> (closes: #326416).
+ - Removed build-depends on libraries: kdelibs4, libqt3c102-mt, libacl1,
+ libart-2.0-2, libattr1, libgcc1, libice6, libidn11, libncurses5,
+ libpng12-0, libsm6, libx11-6, libxcursor1, libxext6, libxft2, libxrandr2,
+ libxrender1, libxt6, libaudio2, libexpat1, libfam0c102, libfontconfig1,
+ libfreetype6, and zlib1g.
+ - Removed build-depends on 'Priority: required' packages: base-files,
+ coreutils.
+ - Also removed build-depends on binutils, zlib1g-dev, gettext and xutils.
+ * KIPI interface added, (closes: #306386).
+ - Added build dependency on libkipi0-dev.
+ - Added Recommends: kipi-plugins.
+ * Added Recommends: kdegraphics, as it gives EXIF support for Kimdaba.
+ * Package description extended to inform of the new plugin capability.
+ * First version after C++ ABI change.
+
+ -- David L. Moreno <david.lopez.moreno at hispalinux.es> Wed, 3 Sep 2005 23:23:55 +0200
+
+kimdaba (2.0-4) unstable; urgency=low
+
+ * Broken i386 package on Sid, unnecessary dependency on kdelibs 4:4.3.0
+ removed (closes: #309752).
+ * Upstream KDE-help documentation is only in Docbook format. Only HTML,
+ DebianDoc-SGML or Text are acceptable. Removed debian/kimdaba.doc-base
+ (closes: #308985).
+
+ -- David L. Moreno <david.lopez.moreno at hispalinux.es> Thu, 19 May 2005 12:56:00 +0200
+
+kimdaba (2.0-3) unstable; urgency=low
+
+ * Explicit Build-Depends on gcc-3.3, libstdc++5, libc6-dev and libc6 removed
+ to allow build on ia64, alpha and ppc64 (closes: #300309).
+ * Corrected "a XML" typo on Description and manpage (closes: #299997).
+
+ -- David L. Moreno <david.lopez.moreno at hispalinux.es> Wed, 11 May 2005 09:28:08 +0200
+
+kimdaba (2.0-2) unstable; urgency=low
+
+ * Changelog fixed, ITP bug closed (closes: #227525).
+ * Cleaned up build dependencies on versioned libraries.
+
+ -- David L. Moreno <david.lopez.moreno at hispalinux.es> Fri, 3 Dec 2004 11:44:22 +0100
+
+kimdaba (2.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Manpage updated. New option --import added.
+
+ -- David L. Moreno <david.lopez.moreno at hispalinux.es> Tue, 19 Oct 2004 09:22:37 +0200
+
+kimdaba (1.1-1) unstable; urgency=low
+
+ * Initial Release.
+ * Missing manpage added.
+
+ -- David L. Moreno <david.lopez.moreno at hispalinux.es> Sun, 9 May 2004 18:00:54 +0200
Copied: kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/debian-changes-4.1.1-3 (from rev 18884, kde-extras/kphotoalbum/trunk/debian/patches/debian-changes-4.1.1-3)
===================================================================
--- kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/debian-changes-4.1.1-3 (rev 0)
+++ kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/debian-changes-4.1.1-3 2011-05-30 01:42:05 UTC (rev 18885)
@@ -0,0 +1,29 @@
+Description: Upstream changes introduced in version 4.1.1-3
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ kphotoalbum (4.1.1-3) unstable; urgency=low
+ .
+ * Update Build-Depends for KDE SC 4.4.3 (Closes: #579986)
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Mark Purcell <msp at debian.org>
+Bug-Debian: http://bugs.debian.org/579986
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- /dev/null
++++ kphotoalbum-4.1.1/doc/CMakeLists.txt
+@@ -0,0 +1 @@
++kde4_create_handbook( index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en/ SUBDIR kphotoalbum)
Copied: kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/fedora-docbook-fix.diff (from rev 18884, kde-extras/kphotoalbum/trunk/debian/patches/fedora-docbook-fix.diff)
===================================================================
--- kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/fedora-docbook-fix.diff (rev 0)
+++ kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/fedora-docbook-fix.diff 2011-05-30 01:42:05 UTC (rev 18885)
@@ -0,0 +1,244 @@
+Description: Upstream changes introduced in version 4.1.1-3ubuntu1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ kphotoalbum (4.1.1-3ubuntu1) maverick; urgency=low
+ .
+ * Add patch from Fedora to fix docbook format for 4.1.2-dtd transition
+ .
+http://cvs.fedoraproject.org/viewvc/devel/kphotoalbum/kphotoalbum-4.1.1-docbook_fix.patch
+
+ The person named in the Author field signed this changelog entry.
+Author: Scott Kitterman <scott at kitterman.com>
+
+--- kphotoalbum-4.1.1.orig/doc/index.docbook
++++ kphotoalbum-4.1.1/doc/index.docbook
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+ <!ENTITY kphotoalbum "<application>KPhotoAlbum</application>">
+ <!ENTITY kappname "&kphotoalbum;">
+ <!ENTITY package "kdeextragear-2">
+@@ -41,12 +41,6 @@
+ <date>2004-08-06</date>
+ <releaseinfo>2.0</releaseinfo>
+
+- <keywordset>
+- <keyword>KDE</keyword>
+- <keyword>kdeextragear-2</keyword>
+- <keyword>KPhotoAlbum</keyword>
+- <keyword>Image Database</keyword>
+- </keywordset>
+ <abstract><para>
+ This is the user manual for &kphotoalbum;. If you are
+ not the type who likes reading documentation, but rather just want to try
+@@ -64,6 +58,12 @@ menu and select <guimenuitem>Run &kphoto
+ on long HTML document at <ulink
+ url="http://www.kphotoalbum.org/">&kphotoalbum;'s Homepage</ulink></para>
+ </abstract>
++ <keywordset>
++ <keyword>KDE</keyword>
++ <keyword>kdeextragear-2</keyword>
++ <keyword>KPhotoAlbum</keyword>
++ <keyword>Image Database</keyword>
++ </keywordset>
+ </bookinfo>
+
+ &introduction;
+--- kphotoalbum-4.1.1.orig/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook
++++ kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+ <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+ <releaseinfo
+ >2.0</releaseinfo>
+
+- <keywordset>
+- <keyword
+->KDE</keyword>
+- <keyword
+->kdeextragear-2</keyword>
+- <keyword
+->KPhotoAlbum</keyword>
+- <keyword
+->База даних зображень</keyword>
+- </keywordset>
+ <abstract
+ ><para
+ >Це інструкція користувача для &kphotoalbum;. Якщо ви не любитель або любителька читання документації і надаєте перевагу самостійному вивченню програми шляхом експериментів, ви можете піти одним з таких шляхів: <itemizedlist>
+@@ -100,6 +90,12 @@
+ >домашній сторінці &kphotoalbum;</ulink
+ ></para>
+ </abstract>
++ <keywordset>
++ <keyword>KDE</keyword>
++ <keyword>kdeextragear-2</keyword>
++ <keyword>KPhotoAlbum</keyword>
++ <keyword>База даних зображень</keyword>
++ </keywordset>
+ </bookinfo>
+
+ &introduction;
+--- kphotoalbum-4.1.1.orig/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook
++++ kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+ <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+ <releaseinfo
+ >2.0</releaseinfo>
+
+- <keywordset>
+- <keyword
+->KDE</keyword>
+- <keyword
+->kdeextragear-2</keyword>
+- <keyword
+->Kfotoalbum</keyword>
+- <keyword
+->Bilddatabas</keyword>
+- </keywordset>
+ <abstract
+ ><para
+ >Det här är användarmanualen för Kfotoalbum. Om du inte är den som gillar att läsa dokumentation, utan istället bara vill försöka dig på saker och ting, ges här några alternativ: <itemizedlist>
+@@ -100,6 +90,12 @@
+ >Kfotoalbums hemsida</ulink
+ ></para>
+ </abstract>
++ <keywordset>
++ <keyword>KDE</keyword>
++ <keyword>kdeextragear-2</keyword>
++ <keyword>Kfotoalbum</keyword>
++ <keyword>Bilddatabas</keyword>
++ </keywordset>
+ </bookinfo>
+
+ &introduction;
+--- kphotoalbum-4.1.1.orig/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook
++++ kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+ <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+ <releaseinfo
+ >2.0</releaseinfo>
+
+- <keywordset>
+- <keyword
+->KDE</keyword>
+- <keyword
+->kdeextragear-2</keyword>
+- <keyword
+->KPhotoAlbum</keyword>
+- <keyword
+->Bilddatenbank</keyword>
+- </keywordset>
+ <abstract
+ ><para
+ >Dies ist das Benutzerhandbuch für &kphotoalbum;. Wenn Sie nicht gerne Handbücher lesen, sondern lieber gleich Funktionen ausprobieren möchten, haben Sie folgende Alternativen zu diesem Handbuch: <itemizedlist>
+@@ -102,6 +92,12 @@
+ >HTML</acronym
+ >-Dokument zum Herunterladen.</para>
+ </abstract>
++ <keywordset>
++ <keyword>KDE</keyword>
++ <keyword>kdeextragear-2</keyword>
++ <keyword>KPhotoAlbum</keyword>
++ <keyword>Bilddatenbank</keyword>
++ </keywordset>
+ </bookinfo>
+
+ &introduction;
+--- kphotoalbum-4.1.1.orig/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook
++++ kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+ <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+ <releaseinfo
+ >2.0</releaseinfo>
+
+- <keywordset>
+- <keyword
+->KDE</keyword>
+- <keyword
+->kdeextragear-2</keyword>
+- <keyword
+->KPhotoAlbum</keyword>
+- <keyword
+->Banca dati immagini</keyword>
+- </keywordset>
+ <abstract
+ ><para
+ >Questo è il manuale utente di &kphotoalbum;. Se non sei il tipo a cui piace leggere la documentazione, ma che preferisce provare a far funzionare le cose, eccoti delle alternative: <itemizedlist>
+@@ -100,6 +90,12 @@
+ >homepage di &kphotoalbum;</ulink
+ ></para>
+ </abstract>
++ <keywordset>
++ <keyword>KDE</keyword>
++ <keyword>kdeextragear-2</keyword>
++ <keyword>KPhotoAlbum</keyword>
++ <keyword>Banca dati immagini</keyword>
++ </keywordset>
+ </bookinfo>
+
+ &introduction;
+--- kphotoalbum-4.1.1.orig/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook
++++ kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+ <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+ <releaseinfo
+ >2.0</releaseinfo>
+
+- <keywordset>
+- <keyword
+->KDE</keyword>
+- <keyword
+->kdeextragear-2</keyword>
+- <keyword
+->KPhotoAlbum</keyword>
+- <keyword
+->Piltide andmebaas</keyword>
+- </keywordset>
+ <abstract
+ ><para
+ >See on &kphotoalbum;i käsiraamat. Kui sa ei armasta eriti käsiraamatuid lugeda, vaid soovid lihtsalt proovida, mis mida teeb, siis on sinu ees lahti mitu võimalust: <itemizedlist>
+@@ -100,6 +90,12 @@
+ >&kphotoalbum;i koduleheküljelt</ulink
+ >.</para>
+ </abstract>
++ <keywordset>
++ <keyword>KDE</keyword>
++ <keyword>kdeextragear-2</keyword>
++ <keyword>KPhotoAlbum</keyword>
++ <keyword>Piltide andmebaas</keyword>
++ </keywordset>
+ </bookinfo>
+
+ &introduction;
Copied: kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/series (from rev 18884, kde-extras/kphotoalbum/trunk/debian/patches/series)
===================================================================
--- kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/series (rev 0)
+++ kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/series 2011-05-30 01:42:05 UTC (rev 18885)
@@ -0,0 +1,4 @@
+01_kphotoalbum_stable_branch_pull.diff
+debian-changes-4.1.1-3
+fedora-docbook-fix.diff
+ubuntu-exiv2-0.21.diff
Copied: kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/ubuntu-exiv2-0.21.diff (from rev 18884, kde-extras/kphotoalbum/trunk/debian/patches/ubuntu-exiv2-0.21.diff)
===================================================================
--- kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/ubuntu-exiv2-0.21.diff (rev 0)
+++ kde-extras/kphotoalbum/tags/4.1.1-4/debian/patches/ubuntu-exiv2-0.21.diff 2011-05-30 01:42:05 UTC (rev 18885)
@@ -0,0 +1,50 @@
+Description: Fix compilation error with exiv2 0.21
+Origin: https://projects.kde.org/projects/extragear/graphics/kphotoalbum/repository/revisions/8f8d9a42092a29499e7c8f568d1b9e9be3d6d55e
+--- kphotoalbum/Exif/Info.cpp 2010/08/16 08:04:32 1164187
++++ kphotoalbum/Exif/Info.cpp 2011/01/09 06:50:40 1213128
+@@ -106,6 +106,28 @@
+ return res;
+
+ QList<const Exiv2::TagInfo*> tags;
++ std::ostringstream s;
++
++#if (EXIV2_TEST_VERSION(0,21,0))
++ const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList();
++ while (gi->tagList_ != 0) {
++ Exiv2::TagListFct tl = gi->tagList_;
++ const Exiv2::TagInfo* ti = tl();
++
++ while (ti->tag_ != 0xFFFF) {
++ tags << ti;
++ ++ti;
++ }
++ ++gi;
++ }
++
++ for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it) {
++ while ( (*it)->tag_ != 0xffff ) {
++ res.insert(QString::fromLatin1(Exiv2::ExifKey(**it).key().c_str()));
++ ++(*it);
++ }
++ }
++#else
+ tags <<
+ Exiv2::ExifTags::ifdTagList() <<
+ Exiv2::ExifTags::exifTagList() <<
+@@ -121,7 +143,6 @@
+ // Now the ugly part -- exiv2 doesn't have any way to get a list of
+ // MakerNote tags in a reasonable form, so we have to parse it from strings
+
+- std::ostringstream s;
+ for ( Exiv2::IfdId kind = Exiv2::canonIfdId; kind < Exiv2::lastIfdId;
+ kind = static_cast<Exiv2::IfdId>( kind + 1 ) ) {
+ #if EXIV2_TEST_VERSION(0,17,0)
+@@ -130,6 +151,7 @@
+ Exiv2::ExifTags::makerTaglist( s, kind );
+ #endif
+ }
++#endif
+
+ // IPTC tags use yet another format...
+ Exiv2::IptcDataSets::dataSetList( s );
+
More information about the pkg-kde-commits
mailing list