r34235 - in /desktop/unstable/gdk-pixbuf/debian: changelog control control.in

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Mon Apr 16 05:20:02 2012
New Revision: 34235

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34235
Log:
re-add alternative libpng12-dev build dependency, to avoid a purely virtual dependency

Modified:
    desktop/unstable/gdk-pixbuf/debian/changelog
    desktop/unstable/gdk-pixbuf/debian/control
    desktop/unstable/gdk-pixbuf/debian/control.in

Modified: desktop/unstable/gdk-pixbuf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/changelog?rev=34235&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/changelog [utf-8] Mon Apr 16 05:20:02 2012
@@ -4,8 +4,8 @@
     - Fix srcdir != builddir build.
     - Avoid an integer overflow in the xbm loader. (LP: #681150)
     - Translation updates.
-  * debian/control.in: Build-depend against libpng-dev instead of
-    libpng12-dev. (Closes: #662344)
+  * debian/control.in: Prefer building against libpng-dev over libpng12-dev,
+    to be prepared for the libpng 1.5 transition. (Closes: #662344)
   * debian/control.in: Bump Standards-Version to 3.9.3 (no changes necessary).
 
  -- Martin Pitt <mpitt at debian.org>  Mon, 16 Apr 2012 07:10:09 +0200

Modified: desktop/unstable/gdk-pixbuf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/control?rev=34235&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/control [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/control [utf-8] Mon Apr 16 05:20:02 2012
@@ -14,7 +14,7 @@
                gnome-pkg-tools (>= 0.10),
                libglib2.0-dev (>= 2.31.0),
                libx11-dev,
-               libpng-dev,
+               libpng-dev | libpng12-dev,
                libjpeg-dev,
                libjasper-dev,
                libtiff4-dev,

Modified: desktop/unstable/gdk-pixbuf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/control.in?rev=34235&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/control.in [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/control.in [utf-8] Mon Apr 16 05:20:02 2012
@@ -9,7 +9,7 @@
                gnome-pkg-tools (>= 0.10),
                libglib2.0-dev (>= 2.31.0),
                libx11-dev,
-               libpng-dev,
+               libpng-dev | libpng12-dev,
                libjpeg-dev,
                libjasper-dev,
                libtiff4-dev,