[libreoffice] 01/01: build-depend on libpng-dev instead of libpng12-dev (closes: #662411)

[Rene Engelhard <rene@moszumanska.debian.org>]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit f8bb0bdeb7954faf0d82922dfe909f21cbfe709a
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Jan 5 15:52:29 2016 +0100

    build-depend on libpng-dev instead of libpng12-dev (closes: #662411)
---
 changelog | 4 +++-
 control   | 4 ++--
 rules     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index c99d3e8..84945cb 100644
--- a/changelog
+++ b/changelog
@@ -12,8 +12,10 @@ libreoffice (1:5.0.4-1) UNRELEASED; urgency=medium
   * debian/control.debug.in: recommend gdb
   * debian/control.debug.in, debian/rules: move python(3)-six to recommends
     and recommend python3-six on sid as "gdb" uses python3. 
+  * debian/rules:
+    - build-depend on libpng-dev instead of libpng12-dev (closes: #662411)
 
- -- Rene Engelhard <rene@debian.org>  Mon, 21 Dec 2015 14:32:33 +0100
+ -- Rene Engelhard <rene@debian.org>  Tue, 05 Jan 2016 15:45:29 +0100
 
 libreoffice (1:5.0.4~rc2-2) unstable; urgency=medium
 
diff --git a/control b/control
index de63a73..c4b448f 100644
--- a/control
+++ b/control
@@ -100,7 +100,7 @@ Build-Depends: ant (>= 1.7.0),
                liborcus-dev (>= 0.9.2-2),
                libpagemaker-dev,
                libpcre3-dev [amd64 i386],
-               libpng12-dev,
+               libpng-dev,
                libpoppler-cpp-dev,
                libpoppler-dev (>= 0.12.0),
                libpoppler-private-dev,
@@ -4436,7 +4436,7 @@ Depends: ant (>= 1.7.0),
          liborcus-dev (>= 0.9.2-2),
          libpagemaker-dev,
          libpcre3-dev,
-         libpng12-dev,
+         libpng-dev,
          libpoppler-cpp-dev,
          libpoppler-dev (>= 0.12.0),
          libpoppler-private-dev,
diff --git a/rules b/rules
index 6d6d719..425f567 100755
--- a/rules
+++ b/rules
@@ -802,7 +802,7 @@ ifneq (,$(filter sane, $(SYSTEM_STUFF)))
        BUILD_DEPS += , libsane-dev
 endif
 ifneq (,$(filter libpng, $(SYSTEM_STUFF)))
-       BUILD_DEPS += , libpng12-dev
+       BUILD_DEPS += , libpng-dev
 endif
 
 ifneq (,$(filter curl, $(SYSTEM_STUFF)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git