rev 19063 - in kde-extras/exiv2/trunk/debian: . patches

Mark Purcell msp at alioth.debian.org
Tue Jan 24 20:19:11 UTC 2012


Author: msp
Date: 2012-01-24 20:19:10 +0000 (Tue, 24 Jan 2012)
New Revision: 19063

Added:
   kde-extras/exiv2/trunk/debian/exiv2.bug-presub
   kde-extras/exiv2/trunk/debian/libexiv2-doc.examples
   kde-extras/exiv2/trunk/debian/libexiv2-doc.linktrees
   kde-extras/exiv2/trunk/debian/patches/spelling-error-in-binary.diff
   kde-extras/exiv2/trunk/debian/patches/spelling-error-in-manpage.diff
Removed:
   kde-extras/exiv2/trunk/debian/exiv2.examples
   kde-extras/exiv2/trunk/debian/libexiv2-dev.lintian-overrides
   kde-extras/exiv2/trunk/debian/presubj
Modified:
   kde-extras/exiv2/trunk/debian/changelog
   kde-extras/exiv2/trunk/debian/control
   kde-extras/exiv2/trunk/debian/copyright
   kde-extras/exiv2/trunk/debian/exiv2.install
   kde-extras/exiv2/trunk/debian/libexiv2-doc.docs
   kde-extras/exiv2/trunk/debian/patches/series
   kde-extras/exiv2/trunk/debian/rules
Log:
* dh_auto_configure  $(shell dpkg-buildflags --export=configure)
  - Fixes "Please enabled hardened build flags" (Closes: #656356)
* dh-linktree - fixes libexiv2-doc: embedded-javascript-library
* Update debian/copyright GPL-2 -  copyright-refers-to-symlink-license
* Fix spelling-error-in-manpage exiv2.1.gz explicitely explicitly
* Fix spelling-error-in-binary
* Switch to dh_bugfiles
* Add samples/ to libexiv2-doc/examples
* Fixed "Lib not recommend exiv2" changes to Suggests: (Closes: #615137)

Modified: kde-extras/exiv2/trunk/debian/changelog
===================================================================
--- kde-extras/exiv2/trunk/debian/changelog	2012-01-24 17:13:51 UTC (rev 19062)
+++ kde-extras/exiv2/trunk/debian/changelog	2012-01-24 20:19:10 UTC (rev 19063)
@@ -1,3 +1,17 @@
+exiv2 (0.22-2) experimental; urgency=low
+
+  * dh_auto_configure  $(shell dpkg-buildflags --export=configure)
+    - Fixes "Please enabled hardened build flags" (Closes: #656356)
+  * dh-linktree - fixes libexiv2-doc: embedded-javascript-library
+  * Update debian/copyright GPL-2 -  copyright-refers-to-symlink-license
+  * Fix spelling-error-in-manpage exiv2.1.gz explicitely explicitly
+  * Fix spelling-error-in-binary
+  * Switch to dh_bugfiles
+  * Add samples/ to libexiv2-doc/examples
+  * Fixed "Lib not recommend exiv2" changes to Suggests: (Closes: #615137)
+
+ -- Mark Purcell <msp at debian.org>  Wed, 25 Jan 2012 07:16:15 +1100
+
 exiv2 (0.22-1) experimental; urgency=low
 
   * New upstream release

Modified: kde-extras/exiv2/trunk/debian/control
===================================================================
--- kde-extras/exiv2/trunk/debian/control	2012-01-24 17:13:51 UTC (rev 19062)
+++ kde-extras/exiv2/trunk/debian/control	2012-01-24 20:19:10 UTC (rev 19063)
@@ -5,7 +5,7 @@
 Uploaders: Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), chrpath,
  autotools-dev, libexpat1-dev, zlib1g-dev,
- libexpat1-dev,
+ libjs-jquery, dh-linktree,
  doxygen, graphviz, python, xsltproc
 Standards-Version: 3.8.4
 Homepage: http://www.exiv2.org
@@ -38,7 +38,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: exiv2
+Suggests: exiv2
 Description: EXIF/IPTC metadata manipulation library
  Exiv2 is a C++ library and a command line utility to manage image metadata.
  It provides fast and easy read and write access to the Exif, IPTC and XMP
@@ -67,18 +67,7 @@
  It provides fast and easy read and write access to the Exif, IPTC and XMP
  metadata of images in various formats
  .
- Exiv2 library provides:
-  * fast read and write access to the Exif, IPTC, and XMP metadata of an image
-  * an easy to use and extensively documented API
-  * conversions of Exif and IPTC metadata to XMP and vice versa
-  * a smart IPTC implementation that does not affect data that programs like
-    Photoshop store in the same image segment
-  * Exif Makernote support:
-    - Makernote tags can be read and written just like any other metadata
-    - a sophisticated write algorithm avoids corrupting the Makernote
-  * a simple interface to extract previews embedded in RAW images and Exif
-    thumbnails
-  * set and delete methods for Exif thumbnails
+ This packages provides the development files for using exiv2.
 
 Package: libexiv2-doc
 Depends: ${misc:Depends}

Modified: kde-extras/exiv2/trunk/debian/copyright
===================================================================
--- kde-extras/exiv2/trunk/debian/copyright	2012-01-24 17:13:51 UTC (rev 19062)
+++ kde-extras/exiv2/trunk/debian/copyright	2012-01-24 20:19:10 UTC (rev 19063)
@@ -40,7 +40,7 @@
    Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 XMP sdk license:
 

Copied: kde-extras/exiv2/trunk/debian/exiv2.bug-presub (from rev 18966, kde-extras/exiv2/trunk/debian/presubj)
===================================================================
--- kde-extras/exiv2/trunk/debian/exiv2.bug-presub	                        (rev 0)
+++ kde-extras/exiv2/trunk/debian/exiv2.bug-presub	2012-01-24 20:19:10 UTC (rev 19063)
@@ -0,0 +1,9 @@
+If you know that the bug you want to report is in the "upstream"
+code then please file a bug report in the exiv2 bug tracking system
+on the web at http://dev.exiv2.org/projects/exiv2/issues
+
+If you feel that the bug is one that other Debian users should
+know about then you are welcome to file a report in the Debian BTS
+as well.  Please keep in mind, however, that managing bug reports
+is part of the maintainers' workload.
+

Modified: kde-extras/exiv2/trunk/debian/exiv2.install
===================================================================
--- kde-extras/exiv2/trunk/debian/exiv2.install	2012-01-24 17:13:51 UTC (rev 19062)
+++ kde-extras/exiv2/trunk/debian/exiv2.install	2012-01-24 20:19:10 UTC (rev 19063)
@@ -1,2 +1 @@
 debian/tmp/usr/bin/exiv2
-debian/presubj /usr/share/bug/exiv2/

Modified: kde-extras/exiv2/trunk/debian/libexiv2-doc.docs
===================================================================
--- kde-extras/exiv2/trunk/debian/libexiv2-doc.docs	2012-01-24 17:13:51 UTC (rev 19062)
+++ kde-extras/exiv2/trunk/debian/libexiv2-doc.docs	2012-01-24 20:19:10 UTC (rev 19063)
@@ -1,3 +1,3 @@
-doc/html
 doc/include
-doc/index.html
+doc/*.txt
+src/TODO

Added: kde-extras/exiv2/trunk/debian/libexiv2-doc.examples
===================================================================
--- kde-extras/exiv2/trunk/debian/libexiv2-doc.examples	                        (rev 0)
+++ kde-extras/exiv2/trunk/debian/libexiv2-doc.examples	2012-01-24 20:19:10 UTC (rev 19063)
@@ -0,0 +1 @@
+samples/

Added: kde-extras/exiv2/trunk/debian/libexiv2-doc.linktrees
===================================================================
--- kde-extras/exiv2/trunk/debian/libexiv2-doc.linktrees	                        (rev 0)
+++ kde-extras/exiv2/trunk/debian/libexiv2-doc.linktrees	2012-01-24 20:19:10 UTC (rev 19063)
@@ -0,0 +1 @@
+replace usr/share/doc/libexiv2-doc/html/jquery.js usr/share/javascript/jquery/jquery.js

Modified: kde-extras/exiv2/trunk/debian/patches/series
===================================================================
--- kde-extras/exiv2/trunk/debian/patches/series	2012-01-24 17:13:51 UTC (rev 19062)
+++ kde-extras/exiv2/trunk/debian/patches/series	2012-01-24 20:19:10 UTC (rev 19063)
@@ -1 +1,3 @@
+spelling-error-in-binary.diff
+spelling-error-in-manpage.diff
 00_hyphens_used_as_minus.diff

Added: kde-extras/exiv2/trunk/debian/patches/spelling-error-in-binary.diff
===================================================================
--- kde-extras/exiv2/trunk/debian/patches/spelling-error-in-binary.diff	                        (rev 0)
+++ kde-extras/exiv2/trunk/debian/patches/spelling-error-in-binary.diff	2012-01-24 20:19:10 UTC (rev 19063)
@@ -0,0 +1,29 @@
+Index: exiv2-0.22/src/minoltamn.cpp
+===================================================================
+--- exiv2-0.22.orig/src/minoltamn.cpp	2011-02-14 01:08:44.000000000 +1100
++++ exiv2-0.22/src/minoltamn.cpp	2012-01-25 06:39:28.000000000 +1100
+@@ -1100,9 +1100,9 @@
+         { 8,    N_("White Balance Bracketing Low")  },
+         { 9,    N_("White Balance Bracketing High") },
+         { 770,  N_("Single-frame Bracketing Low")   },
+-        { 771,  N_("Continous Bracketing Low")      },
++        { 771,  N_("Continuous Bracketing Low")      },
+         { 1794, N_("Single-frame Bracketing High")  },
+-        { 1795, N_("Continous Bracketing High")     }
++        { 1795, N_("Continuous Bracketing High")     }
+     };
+ 
+     //! Lookup table to translate Sony A100 camera settings focus mode values to readable labels
+Index: exiv2-0.22/src/sonymn.cpp
+===================================================================
+--- exiv2-0.22.orig/src/sonymn.cpp	2011-02-14 01:08:44.000000000 +1100
++++ exiv2-0.22/src/sonymn.cpp	2012-01-25 06:40:05.000000000 +1100
+@@ -412,7 +412,7 @@
+                 N_("Release Mode"),
+                 sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyReleaseMode)),
+         TagInfo(0xB04A, "SequenceNumber", N_("Sequence Number"),
+-                N_("Shot number in continous burst mode"),
++                N_("Shot number in continuous burst mode"),
+                 sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonySequenceNumber)),
+         TagInfo(0xB04B, "AntiBlur", N_("Anti-Blur"),
+                 N_("Anti-Blur"),

Added: kde-extras/exiv2/trunk/debian/patches/spelling-error-in-manpage.diff
===================================================================
--- kde-extras/exiv2/trunk/debian/patches/spelling-error-in-manpage.diff	                        (rev 0)
+++ kde-extras/exiv2/trunk/debian/patches/spelling-error-in-manpage.diff	2012-01-24 20:19:10 UTC (rev 19063)
@@ -0,0 +1,13 @@
+Index: exiv2-0.22/src/exiv2.1
+===================================================================
+--- exiv2-0.22.orig/src/exiv2.1	2011-09-09 00:31:32.000000000 +1000
++++ exiv2-0.22/src/exiv2.1	2012-01-25 06:35:01.000000000 +1100
+@@ -372,7 +372,7 @@
+ .B XmpText | XmpAlt | XmpBag | XmpSeq | LangAlt
+ for XMP keys.
+ .sp 1
+-A default \fItype\fP is used if none is explicitely given. The default
++A default \fItype\fP is used if none is explicitly given. The default
+ is determined based on \fIkey\fP.
+ .TP
+ .I value

Modified: kde-extras/exiv2/trunk/debian/rules
===================================================================
--- kde-extras/exiv2/trunk/debian/rules	2012-01-24 17:13:51 UTC (rev 19062)
+++ kde-extras/exiv2/trunk/debian/rules	2012-01-24 20:19:10 UTC (rev 19063)
@@ -4,7 +4,7 @@
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-rpath
+	dh_auto_configure -- --disable-rpath  $(shell dpkg-buildflags --export=configure)
 
 override_dh_clean:
 	dh_clean




More information about the pkg-kde-commits mailing list