[SCM] Debian packaging of libimage-exif-perl branch, master, updated. 0615eb2f29dbe6f9d02cc5eef38db8e876a4462b

gregor herrmann gregoa at debian.org
Sun May 27 17:51:38 UTC 2012


The following commit has been merged in the master branch:
commit 237bd34716ad7a54f70ea46103d3c5e307d5e3a7
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun May 27 19:19:29 2012 +0200

    Drop do-not-link-with-libexif.patch, refresh remaining patches.

diff --git a/debian/patches/EXIF_T_GPSIFD.patch b/debian/patches/EXIF_T_GPSIFD.patch
index 5c92099..16c8610 100644
--- a/debian/patches/EXIF_T_GPSIFD.patch
+++ b/debian/patches/EXIF_T_GPSIFD.patch
@@ -1,6 +1,6 @@
 --- a/exif.c
 +++ b/exif.c
-@@ -244,10 +244,11 @@ postprop(struct exifprop *prop, struct e
+@@ -256,10 +256,11 @@
  				return;
  			}
  			break;
@@ -13,7 +13,7 @@
  		}
  	}
  
-@@ -521,11 +522,15 @@ parsetag(struct exifprop *prop, struct i
+@@ -529,11 +530,15 @@
  			readifd(prop->value, &dir->next, tags, md);
  		else
  #endif
@@ -29,7 +29,7 @@
  
  		if (!dir->next) {
  
-@@ -633,7 +638,7 @@ parsetag(struct exifprop *prop, struct i
+@@ -640,7 +645,7 @@
  		 * XXX Note that this is kind of dangerous -- any other
  		 * tag set won't reach the end of the switch...
  		 */
@@ -49,7 +49,7 @@
  #define EXIF_T_MAKERNOTE	0x927c
  #define EXIF_T_INTEROP		0xa005
  
-@@ -139,7 +139,7 @@ extern u_int32_t gcd(u_int32_t a, u_int3
+@@ -148,7 +148,7 @@
  
  /* Interface to exifgps.c. */
  
diff --git a/debian/patches/do-not-link-with-libexif.patch b/debian/patches/do-not-link-with-libexif.patch
deleted file mode 100644
index 71680ab..0000000
--- a/debian/patches/do-not-link-with-libexif.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-# Do not link with libexif as the .so produced do not use its symbols
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -8,7 +8,6 @@ WriteMakefile(
-     ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
-       (ABSTRACT_FROM => 'EXIF.pm', # retrieve abstract from module
-        AUTHOR     => 'sergey s prozhogin <ccpro at rrelaxo.org.ru>') : ()),
--    'LIBS'		=> ['-lexif'], # e.g., '-lm'
-     'DEFINE'		=> '', # e.g., '-DHAVE_SOMETHING'
- 	# Insert -I. if you add *.h files later:
-     'INC'		=> '', # e.g., '-I/usr/include/other'
diff --git a/debian/patches/hashbang.patch b/debian/patches/hashbang.patch
index 55831c3..517c212 100644
--- a/debian/patches/hashbang.patch
+++ b/debian/patches/hashbang.patch
@@ -1,5 +1,5 @@
---- a/create_web_gallery.pl
-+++ b/create_web_gallery.pl
+--- a/examples/create_web_gallery.pl
++++ b/examples/create_web_gallery.pl
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl -w
 +#!/usr/bin/perl -w
diff --git a/debian/patches/series b/debian/patches/series
index e7dcbb4..7d79e8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 EXIF_T_GPSIFD.patch
 hashbang.patch
-do-not-link-with-libexif.patch

-- 
Debian packaging of libimage-exif-perl



More information about the Pkg-perl-cvs-commits mailing list