[SCM] kalzium packaging branch, master, updated. debian/4.7.4-2-3-g0792036

[Sune Vuorela]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kalzium.git;a=commitdiff;h=53a6d7b

The following commit has been merged in the master branch:
commit 53a6d7bb15e04a155839a2151f5905b767bd0411
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Sun Jun 17 02:32:13 2012 +0200

    updat for new upstream
---
 debian/changelog                                   |    4 +++-
 debian/control                                     |    6 +++---
 debian/kalzium.install                             |    4 ++--
 debian/patches/no_install_rpath_use_link_path.diff |   10 +++++++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b42bc04..7ae7480 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 kalzium (4:4.8.4-0r1) UNRELEASED; urgency=low
 
-  * 
+  * New upstream
+    - adapt & refresh patch
+    - adapt install files
 
  -- Sune Vuorela <sune at debian.org>  Sun, 17 Jun 2012 02:16:35 +0200
 
diff --git a/debian/control b/debian/control
index cde5a33..00942ba 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Eshat Cakar <info at eshat.de>,
  José Manuel Santamaría Lema <panfaust at gmail.com>
-Build-Depends: kde-sc-dev-latest (>= 4:4.7.4),
+Build-Depends: kde-sc-dev-latest (>= 4:4.8.4),
  cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
  kdelibs5-dev (>= 4:4.7),
  libqt4-opengl-dev,
@@ -26,8 +26,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, kalzium-data (>= ${source:Version})
 Breaks: libkdeedu4 (<< 4:4.6.2), libscience4
 Replaces: libkdeedu4 (<< 4:4.6.2), libscience4
 Suggests: khelpcenter4
-Description: periodic table and chemistry tools for KDE
- Kalzium is a full-featured chemistry application for KDE, including a
+Description: periodic table and chemistry tools 
+ Kalzium is a full-featured chemistry application, including a
  Periodic Table of Elements, chemical reference, chemical equation solver, and
  3D molecule viewer.
  .
diff --git a/debian/kalzium.install b/debian/kalzium.install
index 0368cb0..8a5f1d0 100644
--- a/debian/kalzium.install
+++ b/debian/kalzium.install
@@ -6,9 +6,9 @@ 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.7.0
+usr/lib/libcompoundviewer.so.4.8.0
 usr/lib/libscience.so.4
-usr/lib/libscience.so.4.7.0
+usr/lib/libscience.so.4.8.0
 usr/share/applications/kde4/kalzium.desktop
 usr/share/kde4/services/concentrationCalculator.desktop
 usr/share/kde4/services/gasCalculator.desktop
diff --git a/debian/patches/no_install_rpath_use_link_path.diff b/debian/patches/no_install_rpath_use_link_path.diff
index 907a9b4..d9a26ee 100644
--- a/debian/patches/no_install_rpath_use_link_path.diff
+++ b/debian/patches/no_install_rpath_use_link_path.diff
@@ -6,19 +6,23 @@ Forwarded: not-needed
 Origin: vendor
 Last-Update: 2011-07-03
 
+Index: b/src/CMakeLists.txt
+===================================================================
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -133,6 +133,7 @@ kde4_add_app_icon(kalzium_SRCS "${CMAKE_
+@@ -133,6 +133,7 @@
  
  kde4_add_executable(kalzium ${kalzium_SRCS})
  
 +set_target_properties(kalzium PROPERTIES INSTALL_RPATH_USE_LINK_PATH false)
- target_link_libraries(kalzium ${KDE4_KHTML_LIBRARY} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KUNITCONVERSION_LIBS} ${QT_QTSCRIPT_LIBRARY} science)
+ target_link_libraries(kalzium ${KDE4_KHTML_LIBRARY} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KUNITCONVERSION_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} science)
  
  if (OPENBABEL2_FOUND)
+Index: b/compoundviewer/CMakeLists.txt
+===================================================================
 --- a/compoundviewer/CMakeLists.txt
 +++ b/compoundviewer/CMakeLists.txt
-@@ -22,6 +22,7 @@ target_link_libraries(compoundviewer
+@@ -22,6 +22,7 @@
     avogadro
  )
  

-- 
kalzium packaging