[SCM] khtml packaging branch, master, updated. debian/5.16.0-1-5-g6712418

Maximiliano Curia maxy at moszumanska.debian.org
Sat Jan 30 09:48:56 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/khtml.git;a=commitdiff;h=6712418

The following commit has been merged in the master branch:
commit 6712418e690c3a816326eee8e94c4257d2740604
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sat Jan 30 10:48:28 2016 +0100

    Merge diff for NMU version 5.16.0-1.1
---
 debian/changelog | 8 ++++++++
 debian/control   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b755ed7..186c995 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,14 @@ khtml (5.18.0-1) experimental; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Jan 2016 13:33:42 +0100
 
+khtml (5.16.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Change libpng12-dev build-dependency to libpng-dev, to ease libpng
+    transition. (Closes: #810187)
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 21 Jan 2016 18:11:51 +0100
+
 khtml (5.16.0-1) unstable; urgency=medium
 
   * New upstream release (5.16.0).
diff --git a/debian/control b/debian/control
index a19dcb4..d63e01b 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends: cmake (>= 2.8.12),
                libkf5xmlgui-dev (>= 5.18.0~),
                libphonon4qt5-dev (>= 4:4.6.0),
                libphonon4qt5experimental-dev (>= 4:4.6.0),
-               libpng12-dev,
+               libpng-dev,
                libqt5x11extras5-dev (>= 5.4),
                libssl-dev,
                pkg-config,

-- 
khtml packaging



More information about the pkg-kde-commits mailing list