Source: qrencode
Version: 3.1.1-1
Severity: important
Tags: patch
User: [email protected]
Usertags: libpng15-transition
Hi,
I uploaded libpng 1.5.2 to experimental.
libpng maintainers plan to transition from libpng 1.2 to 1.5.
I am checking build it the package depend to libpng, and I noticed your package
FTBFS with libpng 1.5.
I created the patch that revise this problem.
Could you check and apply this patch?
Best regards,
Nobuhiro
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.39-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
diff -u qrencode-3.1.1/debian/changelog qrencode-3.1.1/debian/changelog
--- qrencode-3.1.1/debian/changelog
+++ qrencode-3.1.1/debian/changelog
@@ -1,3 +1,9 @@
+qrencode (3.1.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ -- Nobuhiro Iwamatsu <[email protected]> Tue, 13 Sep 2011 15:20:28 +0900
+
qrencode (3.1.1-1) unstable; urgency=low
* New upstream release
only in patch2:
unchanged:
--- qrencode-3.1.1.orig/configure.ac
+++ qrencode-3.1.1/configure.ac
@@ -36,7 +36,7 @@
[build_tools=$withval], [build_tools=yes])
AM_CONDITIONAL(BUILD_TOOLS, [test "x$build_tools" = "xyes" ])
if test x$build_tools = xyes ; then
- PKG_CHECK_MODULES(png, "libpng12")
+ PKG_CHECK_MODULES(png, "libpng15")
fi
dnl --with-tests
only in patch2:
unchanged:
--- qrencode-3.1.1.orig/configure
+++ qrencode-3.1.1/configure
@@ -11445,12 +11445,12 @@
pkg_cv_png_CFLAGS="$png_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5
- ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng15\"\""; } >&5
+ ($PKG_CONFIG --exists --print-errors ""libpng15"") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng12"" 2>/dev/null`
+ pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng15"" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -11463,12 +11463,12 @@
pkg_cv_png_LIBS="$png_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5
- ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng15\"\""; } >&5
+ ($PKG_CONFIG --exists --print-errors ""libpng15"") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng12"" 2>/dev/null`
+ pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng15"" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -11487,14 +11487,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng12""`
+ png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng15""`
else
- png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng12""`
+ png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng15""`
fi
# Put the nasty error message in config.log where it belongs
echo "$png_PKG_ERRORS" >&5
- as_fn_error "Package requirements (\"libpng12\") were not met:
+ as_fn_error "Package requirements (\"libpng15\") were not met:
$png_PKG_ERRORS
