[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.6.5-2-21-ga9f3d76

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Thu Sep 15 23:50:17 UTC 2011


The following commit has been merged in the master branch:
commit 4cd8fe4da61e4f23bc2796acfc36fa93c019cbbe
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Sep 16 01:46:34 2011 +0200

    Fix libpng build depend.
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 419793a..234ab33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ kde4libs (4:4.7.1-0r1) UNRELEASED; urgency=low
     - Update kfreebsd_support.diff.
     - Refreshed other patches to make them apply without offsets.
   * Bump shared-desktop-ontologies build depend to 0.6.50.
+  * Replace libpng-dev build depend with libpng12-dev to avoid accidental builds
+    against libpng packages in experimental.
   * Update installed files.
   * Remove package libkatepartinterfaces4.
   * Add package libkdeclarative5.
diff --git a/debian/control b/debian/control
index d5be661..c465877 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>, Armin
 Build-Depends: debhelper (>= 7.3.16), cmake (>= 2.6.4), pkg-kde-tools (>= 0.14), libdlrestrictions-dev (>= 0.14),
  shared-mime-info (>= 0.30), dpkg-dev (>= 1.15.5), libphonon-dev (>= 4:4.6.0really4.3.80),
  libqt4-dev (>= 4:4.7.0), libqt4-opengl-dev (>= 4:4.7.0), libqtwebkit-dev,
- libpng-dev, libssl-dev, libsm-dev, flex, bison,
+ libpng12-dev, libssl-dev, libsm-dev, flex, bison,
  libsoprano-dev (>= 2.5.60), libstreamanalyzer-dev (>= 0.6.3),
  libxml2-dev, libxml2-utils, libxslt1-dev, libgif-dev,
  libavahi-common-dev, libaspell-dev, libbz2-dev, libenchant-dev, libfam-dev,

-- 
KDE Development Platform Libraries module packaging



More information about the pkg-kde-commits mailing list