[SCM] KDE Education module packaging branch, master, updated. debian/4.6.3-2-11-g9d72469
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Wed Jul 13 21:40:00 UTC 2011
The following commit has been merged in the master branch:
commit ac64fa53da17531f24fe39810320dc1e760750ed
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Wed Jul 13 22:49:52 2011 +0200
Remove step_needs_-lcln.diff
---
debian/changelog | 5 ++++-
debian/patches/series | 1 -
debian/patches/step_needs_-lcln.diff | 11 -----------
3 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 229d638..e74f6ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,10 @@ kdeedu (4:4.6.5-0r0) UNRELEASED; urgency=low
[ José Manuel Santamaría Lema ]
* Bump kde-sc-dev-latest build dependency to 4:4.6.5.
- * Refresh patches.
+ * Refresh patches:
+ - Update no_install_rpath_use_link_path.diff
+ - Remove step_needs_-lcln.diff, no longer needed; thanks Philip Muškovac
+ for noticing.
* Update installed files.
* Update symbols files.
* Update lintian overrides.
diff --git a/debian/patches/series b/debian/patches/series
index 4701263..3335079 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-step_needs_-lcln.diff
no_install_rpath_use_link_path.diff
enable_debianabimanager.diff
diff --git a/debian/patches/step_needs_-lcln.diff b/debian/patches/step_needs_-lcln.diff
deleted file mode 100644
index bade1cc..0000000
--- a/debian/patches/step_needs_-lcln.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/step/step/CMakeLists.txt
-+++ b/step/step/CMakeLists.txt
-@@ -48,7 +48,7 @@ if(STEP_WITH_QALCULATE)
- add_definitions(-DSTEP_WITH_UNITSCALC)
- add_definitions(${QALCULATE_CFLAGS})
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
-- set(qalculate_LIBS ${QALCULATE_LIBRARIES})
-+ set(qalculate_LIBS ${QALCULATE_LIBRARIES} -lcln)
- endif(STEP_WITH_QALCULATE)
-
- find_package(KDE4 REQUIRED)
--
KDE Education module packaging
More information about the pkg-kde-commits
mailing list