r13489 - in /trunk/libimage-exif-perl: create_web_gallery.pl debian/changelog debian/control debian/patches/ debian/patches/EXIF_T_GPSIFD.patch debian/patches/hashbang.patch debian/patches/series debian/rules exif.c exifint.h

gregoa-guest at users.alioth.debian.org gregoa-guest at users.alioth.debian.org
Thu Jan 24 22:45:26 UTC 2008 

Author: gregoa-guest
Date: Thu Jan 24 22:45:26 2008
New Revision: 13489

URL: http://svn.debian.org/wsvn/?sc=1&rev=13489
Log:
Separate patches out into EXIF_T_GPSIFD.patch and hashbang.patch; add
  quilt framework.

Added:
    trunk/libimage-exif-perl/debian/patches/
    trunk/libimage-exif-perl/debian/patches/EXIF_T_GPSIFD.patch
    trunk/libimage-exif-perl/debian/patches/hashbang.patch
    trunk/libimage-exif-perl/debian/patches/series
Modified:
    trunk/libimage-exif-perl/create_web_gallery.pl
    trunk/libimage-exif-perl/debian/changelog
    trunk/libimage-exif-perl/debian/control
    trunk/libimage-exif-perl/debian/rules
    trunk/libimage-exif-perl/exif.c
    trunk/libimage-exif-perl/exifint.h

Modified: trunk/libimage-exif-perl/create_web_gallery.pl
URL: http://svn.debian.org/wsvn/trunk/libimage-exif-perl/create_web_gallery.pl?rev=13489&op=diff
==============================================================================
--- trunk/libimage-exif-perl/create_web_gallery.pl (original)
+++ trunk/libimage-exif-perl/create_web_gallery.pl Thu Jan 24 22:45:26 2008
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/local/bin/perl -w
 #
 # author : sergey s prozhogin (ccpro at rrelaxo.org.ru)
 # script creates web gallery. 

Modified: trunk/libimage-exif-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libimage-exif-perl/debian/changelog?rev=13489&op=diff
==============================================================================
--- trunk/libimage-exif-perl/debian/changelog (original)
+++ trunk/libimage-exif-perl/debian/changelog Thu Jan 24 22:45:26 2008
@@ -1,7 +1,4 @@
 libimage-exif-perl (1.00.3-4) UNRELEASED; urgency=low
-
-  PERL 5.10: builds with perl 5.10, could need more care (patches, Makefile,
-  ...)
 
   [ gregor herrmann ]
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
@@ -24,11 +21,13 @@
     - add generic upstream source location
     - list copyright/license for other copyright holders
     - change to new format
+  * Separate patches out into EXIF_T_GPSIFD.patch and hashbang.patch; add
+    quilt framework.
 
   [ Frank Lichtenheld ]
   * debian/rules: leave nostrip support to dh_strip
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Thu, 24 Jan 2008 22:58:52 +0100
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Thu, 24 Jan 2008 23:43:52 +0100
 
 libimage-exif-perl (1.00.3-3) unstable; urgency=low
 

Modified: trunk/libimage-exif-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libimage-exif-perl/debian/control?rev=13489&op=diff
==============================================================================
--- trunk/libimage-exif-perl/debian/control (original)
+++ trunk/libimage-exif-perl/debian/control Thu Jan 24 22:45:26 2008
@@ -3,7 +3,7 @@
 Section: perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: gregor herrmann <gregor+debian at comodo.priv.at>, Carlo Segre <segre at debian.org>
-Build-Depends: debhelper (>= 6), perl (>= 5.8.0), libexif-dev (>= 0.6.12-1)
+Build-Depends: debhelper (>= 6), perl (>= 5.8.0), libexif-dev (>= 0.6.12-1), quilt
 Standards-Version: 3.7.3
 Homepage: http://search.cpan.org/dist/Image-EXIF/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libimage-exif-perl/

Added: trunk/libimage-exif-perl/debian/patches/EXIF_T_GPSIFD.patch
URL: http://svn.debian.org/wsvn/trunk/libimage-exif-perl/debian/patches/EXIF_T_GPSIFD.patch?rev=13489&op=file
==============================================================================
--- trunk/libimage-exif-perl/debian/patches/EXIF_T_GPSIFD.patch (added)
+++ trunk/libimage-exif-perl/debian/patches/EXIF_T_GPSIFD.patch Thu Jan 24 22:45:26 2008
@@ -1,0 +1,61 @@
+--- libimage-exif-perl.orig/exif.c
++++ libimage-exif-perl/exif.c
+@@ -244,10 +244,11 @@
+ 				return;
+ 			}
+ 			break;
+-
++			/*
+ 		case EXIF_T_GPSIFD:
+ 			gpsprop(prop, t);
+ 			return;
++			*/
+ 		}
+ 	}
+ 
+@@ -521,11 +522,15 @@
+ 			readifd(prop->value, &dir->next, tags, md);
+ 		else
+ #endif
++		  /*
+ 			if (prop->tag == EXIF_T_GPSIFD) {
+ 				dir->next = readifds(prop->value, gpstags, md);
+ 			} else {
++		  */
+ 				dir->next = readifds(prop->value, tags, md);
++		/*
+ 			}
++		*/
+ 
+ 		if (!dir->next) {
+ 
+@@ -633,7 +638,7 @@
+ 		 * XXX Note that this is kind of dangerous -- any other
+ 		 * tag set won't reach the end of the switch...
+ 		 */
+-		if (prop->tagset != gpstags)
++	  //		if (prop->tagset != gpstags)
+ 			break;
+ 		/* FALLTHROUGH */
+ 
+--- libimage-exif-perl.orig/exifint.h
++++ libimage-exif-perl/exifint.h
+@@ -52,7 +52,7 @@
+ /* Exif IFD tags. */
+ 
+ #define EXIF_T_EXIFIFD		0x8769
+-#define EXIF_T_GPSIFD		0x8825
++//#define EXIF_T_GPSIFD		0x8825
+ #define EXIF_T_MAKERNOTE	0x927c
+ #define EXIF_T_INTEROP		0xa005
+ 
+@@ -139,7 +139,7 @@
+ 
+ /* Interface to exifgps.c. */
+ 
+-extern struct exiftag gpstags[];
+-extern void gpsprop(struct exifprop *prop, struct exiftags *t);
++//extern struct exiftag gpstags[];
++//extern void gpsprop(struct exifprop *prop, struct exiftags *t);
+ 
+ #endif

Added: trunk/libimage-exif-perl/debian/patches/hashbang.patch
URL: http://svn.debian.org/wsvn/trunk/libimage-exif-perl/debian/patches/hashbang.patch?rev=13489&op=file
==============================================================================
--- trunk/libimage-exif-perl/debian/patches/hashbang.patch (added)
+++ trunk/libimage-exif-perl/debian/patches/hashbang.patch Thu Jan 24 22:45:26 2008
@@ -1,0 +1,8 @@
+--- libimage-exif-perl.orig/create_web_gallery.pl
++++ libimage-exif-perl/create_web_gallery.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ #
+ # author : sergey s prozhogin (ccpro at rrelaxo.org.ru)
+ # script creates web gallery. 

Added: trunk/libimage-exif-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libimage-exif-perl/debian/patches/series?rev=13489&op=file
==============================================================================
--- trunk/libimage-exif-perl/debian/patches/series (added)
+++ trunk/libimage-exif-perl/debian/patches/series Thu Jan 24 22:45:26 2008
@@ -1,0 +1,2 @@
+EXIF_T_GPSIFD.patch
+hashbang.patch

Modified: trunk/libimage-exif-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libimage-exif-perl/debian/rules?rev=13489&op=diff
==============================================================================
--- trunk/libimage-exif-perl/debian/rules (original)
+++ trunk/libimage-exif-perl/debian/rules Thu Jan 24 22:45:26 2008
@@ -6,6 +6,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
 
 CFLAGS = -Wall -g
 
@@ -20,7 +21,7 @@
 endif
 
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -28,7 +29,7 @@
 	$(MAKE) OPTIMIZE="-Wall $(CFLAGS)" LD_RUN_PATH=""
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 

Modified: trunk/libimage-exif-perl/exif.c
URL: http://svn.debian.org/wsvn/trunk/libimage-exif-perl/exif.c?rev=13489&op=diff
==============================================================================
--- trunk/libimage-exif-perl/exif.c (original)
+++ trunk/libimage-exif-perl/exif.c Thu Jan 24 22:45:26 2008
@@ -244,11 +244,10 @@
 				return;
 			}
 			break;
-			/*
+
 		case EXIF_T_GPSIFD:
 			gpsprop(prop, t);
 			return;
-			*/
 		}
 	}
 
@@ -522,15 +521,11 @@
 			readifd(prop->value, &dir->next, tags, md);
 		else
 #endif
-		  /*
 			if (prop->tag == EXIF_T_GPSIFD) {
 				dir->next = readifds(prop->value, gpstags, md);
 			} else {
-		  */
 				dir->next = readifds(prop->value, tags, md);
-		/*
 			}
-		*/
 
 		if (!dir->next) {
 
@@ -638,7 +633,7 @@
 		 * XXX Note that this is kind of dangerous -- any other
 		 * tag set won't reach the end of the switch...
 		 */
-	  //		if (prop->tagset != gpstags)
+		if (prop->tagset != gpstags)
 			break;
 		/* FALLTHROUGH */
 

Modified: trunk/libimage-exif-perl/exifint.h
URL: http://svn.debian.org/wsvn/trunk/libimage-exif-perl/exifint.h?rev=13489&op=diff
==============================================================================
--- trunk/libimage-exif-perl/exifint.h (original)
+++ trunk/libimage-exif-perl/exifint.h Thu Jan 24 22:45:26 2008
@@ -52,7 +52,7 @@
 /* Exif IFD tags. */
 
 #define EXIF_T_EXIFIFD		0x8769
-//#define EXIF_T_GPSIFD		0x8825
+#define EXIF_T_GPSIFD		0x8825
 #define EXIF_T_MAKERNOTE	0x927c
 #define EXIF_T_INTEROP		0xa005
 
@@ -139,7 +139,7 @@
 
 /* Interface to exifgps.c. */
 
-//extern struct exiftag gpstags[];
-//extern void gpsprop(struct exifprop *prop, struct exiftags *t);
+extern struct exiftag gpstags[];
+extern void gpsprop(struct exifprop *prop, struct exiftags *t);
 
 #endif

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