[SCM] KDE Education module packaging branch, master, updated. debian/4.6.3-1-4-g83c9aa3

Modestas Vainius modax at alioth.debian.org
Sun Jun 5 13:05:54 UTC 2011


The following commit has been merged in the master branch:
commit 5a657a322f6b151074662b5e7584619906260302
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jun 5 14:21:35 2011 +0300

    Temporary drop dependency on OpenBabel as it is RC buggy.
    
    - remove libopenbabel-dev, openbabel and libavogadro-dev from build depends,
      add libopenbabel-dev to build-conflicts;
    - remove libcompoundviewer* from kalzium.install.
    
    This should speed up migration to testing.
---
 debian/changelog       |    7 +++++++
 debian/control         |    5 +++--
 debian/kalzium.install |    2 --
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9657aca..424af84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,13 @@ kdeedu (4:4.6.3-2) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Remove the unused libusb-dev build dependency.
 
+  [ Modestas Vainius ]
+  * Temporary drop dependency on OpenBabel as it is RC buggy. This should speed
+    up migration to testing:
+    - remove libopenbabel-dev, openbabel and libavogadro-dev from build
+      depends, add libopenbabel-dev to build-conflicts;
+    - remove libcompoundviewer* from kalzium.install.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 04 Jun 2011 01:22:21 +0200
 
 kdeedu (4:4.6.3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d25b658..39a78e7 100644
--- a/debian/control
+++ b/debian/control
@@ -12,10 +12,11 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.6.3),
  libboost-python-dev, libcfitsio3-dev (>= 3.040),
  libglu1-mesa-dev, libgs-dev, libnova-dev, libqt4-opengl-dev,
  libreadline-dev, libxslt-dev, ocaml, zlib1g-dev,
- libfacile-ocaml-dev, libopenbabel-dev, openbabel, pkg-config, libgps-dev (>= 2.90),
+ libfacile-ocaml-dev, pkg-config, libgps-dev (>= 2.90),
  xplanet, libeigen2-dev (>> 2.0.3), libgsl0-dev, libqalculate-dev, libglib2.0-dev,
- libspectre-dev, libattica-dev, r-base-core, libavogadro-dev, libglew1.5-dev,
+ libspectre-dev, libattica-dev, r-base-core, libglew1.5-dev,
  libxrender-dev, libqtwebkit-dev
+Build-Conflicts: libopenbabel-dev
 Standards-Version: 3.9.2
 Homepage: http://edu.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdeedu.git
diff --git a/debian/kalzium.install b/debian/kalzium.install
index 9159ac3..088a43a 100644
--- a/debian/kalzium.install
+++ b/debian/kalzium.install
@@ -5,8 +5,6 @@ usr/lib/kde4/nuclearCalculator.so
 usr/lib/kde4/plasma_applet_didyouknow.so
 usr/lib/kde4/plasma_applet_molmassCalculator.so
 usr/lib/kde4/plasma_engine_kalzium.so
-usr/lib/libcompoundviewer.so.4
-usr/lib/libcompoundviewer.so.4.6.0
 usr/share/applications/kde4/kalzium.desktop
 usr/share/kde4/services/concentrationCalculator.desktop
 usr/share/kde4/services/gasCalculator.desktop

-- 
KDE Education module packaging



More information about the pkg-kde-commits mailing list