On Tue, Dec 19, 2006 at 12:21:32PM +0100, Andreas Barth wrote: >* Steve Langasek (vorlon@debian.org) [061219 12:07]: >>On Tue, Dec 19, 2006 at 11:32:06AM +0100, Andreas Barth wrote: >>>I write down what I think we should do, and how this handles our issues. >>>This is explicitly a request for comments, and I want to wait at least >>>until either Steve and Joss have both agreed to it, or 24 hours has >>>passed, whatever is earlier. >> >>>So, what needs to be done: >> >>>1. Adding back png_read_destroy and png_write_destroy which were >>>accidentially removed between 1.2.13-4 and 1.2.15~beta5-0. >> >>>2. Conflict with the following packages (from sarge): >>>libtk-img (<= 1.3-13) >> >>Missing an epoch, and I'm not sure why you want a versioned conflict with >>this one when the unstable version still has the same problem as the version >>in sarge. > >Because we "know" the unstable version doesn't fall to bad with the >versio in testing - but who has tested the stable version? The >underlaying policy is that one conflict to much is less worse than to >break stuff. Please find diff file as an attachment. >Cheers, >Andi >-- > http://home.arcor.de/andreas-barth/ Best Regards, Aníbal Monsalve Salazar -- http://v7w.com/anibal
interdiff -z -p1 libpng_1.2.15~beta5-0.diff.gz libpng_1.2.15~beta5-1.diff.gz
diff -u libpng-1.2.15~beta5/debian/changelog libpng-1.2.15~beta5/debian/changelog
--- libpng-1.2.15~beta5/debian/changelog
+++ libpng-1.2.15~beta5/debian/changelog
@@ -1,3 +1,13 @@
+libpng (1.2.15~beta5-1) unstable; urgency=low
+
+ * Applied legacy_symbols.patch.
+ * Changed shlibs dependecy versions to ">= 1.2.13-4".
+ * libpng12-0: Added the following conflicts: mzscheme (<= 1:209-5),
+ pngcrush (<= 1.5.10-2), pngmeta (<= 1.11-3), qemacs (<= 0.3.1-5),
+ povray-3.5 (<= 3.5.0c-10).
+
+ -- Anibal Monsalve Salazar <anibal@debian.org> Wed, 20 Dec 2006 10:24:18 +1100
+
libpng (1.2.15~beta5-0) unstable; urgency=high
* New upstream release.
diff -u libpng-1.2.15~beta5/debian/libpng12-0.shlibs libpng-1.2.15~beta5/debian/libpng12-0.shlibs
--- libpng-1.2.15~beta5/debian/libpng12-0.shlibs
+++ libpng-1.2.15~beta5/debian/libpng12-0.shlibs
@@ -1,2 +1,2 @@
-libpng12 0 libpng12-0 (>= 1.2.15~beta5)
-udeb: libpng12 0 libpng12-0-udeb (>= 1.2.15~beta5)
+libpng12 0 libpng12-0 (>= 1.2.13-4)
+udeb: libpng12 0 libpng12-0-udeb (>= 1.2.13-4)
diff -u libpng-1.2.15~beta5/debian/control libpng-1.2.15~beta5/debian/control
--- libpng-1.2.15~beta5/debian/control
+++ libpng-1.2.15~beta5/debian/control
@@ -10,7 +10,7 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libpng12-dev (<= 1.2.8rel-7)
+Conflicts: libpng12-dev (<= 1.2.8rel-7), mzscheme (<= 1:209-5), pngcrush (<= 1.5.10-2), pngmeta (<= 1.11-3), qemacs (<= 0.3.1-5), povray-3.5 (<= 3.5.0c-10)
Replaces: libpng12-dev (<= 1.2.8rel-7)
Description: PNG library - runtime
libpng is a library implementing an interface for reading and writing
only in patch2:
unchanged:
--- libpng-1.2.15~beta5.orig/png.h
+++ libpng-1.2.15~beta5/png.h
@@ -1720,7 +1720,8 @@
png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));
/* free all memory used by the read (old method - NOT DLL EXPORTED) */
-extern void png_read_destroy PNGARG((png_structp png_ptr, png_infop info_ptr,
+/* Debian note: exporting as it is required by legacy applications */
+extern PNG_EXPORT(void,png_read_destroy) PNGARG((png_structp png_ptr, png_infop info_ptr,
png_infop end_info_ptr));
/* free any memory associated with the png_struct and the png_info_structs */
@@ -1728,7 +1729,8 @@
PNGARG((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr));
/* free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */
-extern void png_write_destroy PNGARG((png_structp png_ptr));
+/* Debian note: exporting as it is required by legacy applications */
+extern PNG_EXPORT(void,png_write_destroy) PNGARG((png_structp png_ptr));
/* set the libpng method of handling chunk CRC errors */
extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr,
Attachment:
signature.asc
Description: Digital signature