rev 18884 - in kde-extras/kphotoalbum/trunk/debian: . patches
Scott Kitterman
kitterman at alioth.debian.org
Mon May 30 01:23:12 UTC 2011
Author: kitterman
Date: 2011-05-30 01:23:12 +0000 (Mon, 30 May 2011)
New Revision: 18884
Added:
kde-extras/kphotoalbum/trunk/debian/patches/debian-changes-4.1.1-3
kde-extras/kphotoalbum/trunk/debian/patches/fedora-docbook-fix.diff
kde-extras/kphotoalbum/trunk/debian/patches/ubuntu-exiv2-0.21.diff
Modified:
kde-extras/kphotoalbum/trunk/debian/changelog
kde-extras/kphotoalbum/trunk/debian/patches/series
Log:
* 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)
Modified: kde-extras/kphotoalbum/trunk/debian/changelog
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/changelog 2011-05-29 21:18:18 UTC (rev 18883)
+++ kde-extras/kphotoalbum/trunk/debian/changelog 2011-05-30 01:23:12 UTC (rev 18884)
@@ -1,9 +1,14 @@
-kphotoalbum (4.1.1-4) UNRELEASED; urgency=low
+kphotoalbum (4.1.1-4) unstable; urgency=low
- * NOT RELEASED YET
+ * Team Upload
[ Scott Kitterman ]
- * Update debian/control: add shared-desktop-ontologies build dependency.
+ * 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.
@@ -11,7 +16,7 @@
- enable parallel build (pass --parallel option to dh).
- remove override_dh_compress - not needed anymore.
- -- Mark Purcell <msp at debian.org> Mon, 03 May 2010 20:24:59 +1000
+ -- Scott Kitterman <scott at kitterman.com> Sun, 29 May 2011 20:45:23 -0400
kphotoalbum (4.1.1-3) unstable; urgency=low
Added: kde-extras/kphotoalbum/trunk/debian/patches/debian-changes-4.1.1-3
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/patches/debian-changes-4.1.1-3 (rev 0)
+++ kde-extras/kphotoalbum/trunk/debian/patches/debian-changes-4.1.1-3 2011-05-30 01:23:12 UTC (rev 18884)
@@ -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)
Added: kde-extras/kphotoalbum/trunk/debian/patches/fedora-docbook-fix.diff
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/patches/fedora-docbook-fix.diff (rev 0)
+++ kde-extras/kphotoalbum/trunk/debian/patches/fedora-docbook-fix.diff 2011-05-30 01:23:12 UTC (rev 18884)
@@ -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;
Modified: kde-extras/kphotoalbum/trunk/debian/patches/series
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/patches/series 2011-05-29 21:18:18 UTC (rev 18883)
+++ kde-extras/kphotoalbum/trunk/debian/patches/series 2011-05-30 01:23:12 UTC (rev 18884)
@@ -1 +1,4 @@
01_kphotoalbum_stable_branch_pull.diff
+debian-changes-4.1.1-3
+fedora-docbook-fix.diff
+ubuntu-exiv2-0.21.diff
Added: kde-extras/kphotoalbum/trunk/debian/patches/ubuntu-exiv2-0.21.diff
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/patches/ubuntu-exiv2-0.21.diff (rev 0)
+++ kde-extras/kphotoalbum/trunk/debian/patches/ubuntu-exiv2-0.21.diff 2011-05-30 01:23:12 UTC (rev 18884)
@@ -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