[SCM] KDE Education module packaging branch, master, updated. debian/4.4.5-2-18-g4fa37a0

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Sun Mar 6 00:44:44 UTC 2011


The following commit has been merged in the master branch:
commit 76508ab261aeac7448b3256c98719e6e84cbee42
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sat Mar 5 20:07:52 2011 +0100

    Update patches.
---
 debian/changelog                                   |    1 +
 .../patches/02_no_install_rpath_use_link_path.diff |   30 +++++++------------
 debian/patches/kstars_unswap_fields_in_wizard.diff |   28 ------------------
 debian/patches/series                              |    1 -
 4 files changed, 12 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7392566..4ec9ffb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kdeedu (4:4.6.1-0r0) UNRELEASED; urgency=low
 
   [ José Manuel Santamaría Lema ]
   * Refreshed 02_no_install_rpath_use_link_path.diff patch.
+  * Remove kstars_unswap_fields_in_wizard.diff, no longer needed.
   * Update installed files.
   * Add build depends libavogadro-dev and libglew1.5-dev.
   * Bump kde-sc-dev-latest build dependency to 4:4.6.1.
diff --git a/debian/patches/02_no_install_rpath_use_link_path.diff b/debian/patches/02_no_install_rpath_use_link_path.diff
index 51f04b1..660eb1c 100644
--- a/debian/patches/02_no_install_rpath_use_link_path.diff
+++ b/debian/patches/02_no_install_rpath_use_link_path.diff
@@ -7,10 +7,8 @@ Subject: disable INSTALL_RPATH_USE_LINK_PATH where it triggers useless RPATH
 Forwarded: not-needed
 Origin: vendor
 Last-Update: 2010-07-27
-Index: kdeedu/cantor/src/backends/R/rserver/CMakeLists.txt
-===================================================================
---- kdeedu.orig/cantor/src/backends/R/rserver/CMakeLists.txt	2010-06-08 12:10:24.000000000 +0200
-+++ kdeedu/cantor/src/backends/R/rserver/CMakeLists.txt	2010-09-02 11:16:21.000000000 +0200
+--- a/cantor/src/backends/R/rserver/CMakeLists.txt
++++ b/cantor/src/backends/R/rserver/CMakeLists.txt
 @@ -17,6 +17,7 @@
  add_custom_target(rautoloads COMMAND ${R_EXECUTABLE} --slave --file=${CMAKE_CURRENT_SOURCE_DIR}/tools/autoloads.r > ${CMAKE_CURRENT_BINARY_DIR}/rautoloads.h )
  
@@ -19,11 +17,9 @@ Index: kdeedu/cantor/src/backends/R/rserver/CMakeLists.txt
  target_link_libraries( cantor_rserver ${KDE4_KDEUI_LIBS} cantorlibs ${R_LIBRARIES} ${KDE4_KIO_LIBS})
  add_dependencies(cantor_rserver renvvars rautoloads)
  
-Index: kdeedu/kalzium/src/CMakeLists.txt
-===================================================================
---- kdeedu.orig/kalzium/src/CMakeLists.txt	2010-06-08 12:11:51.000000000 +0200
-+++ kdeedu/kalzium/src/CMakeLists.txt	2010-09-02 11:16:21.000000000 +0200
-@@ -128,6 +128,7 @@
+--- a/kalzium/src/CMakeLists.txt
++++ b/kalzium/src/CMakeLists.txt
+@@ -130,6 +130,7 @@
  
  kde4_add_executable(kalzium ${kalzium_SRCS})
  
@@ -31,22 +27,18 @@ Index: kdeedu/kalzium/src/CMakeLists.txt
  target_link_libraries(kalzium ${KDE4_KHTML_LIBRARY} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KUNITCONVERSION_LIBS} science kdeeduui)
  
  if (OPENBABEL2_FOUND)
-Index: kdeedu/cantor/src/backends/R/CMakeLists.txt
-===================================================================
---- kdeedu.orig/cantor/src/backends/R/CMakeLists.txt	2010-06-08 12:10:25.000000000 +0200
-+++ kdeedu/cantor/src/backends/R/CMakeLists.txt	2010-09-02 11:16:21.000000000 +0200
-@@ -18,6 +18,7 @@
+--- a/cantor/src/backends/R/CMakeLists.txt
++++ b/cantor/src/backends/R/CMakeLists.txt
+@@ -21,6 +21,7 @@
  kde4_add_ui_files(RBackend_SRCS settings.ui)
  
  kde4_add_plugin( cantor_rbackend ${RBackend_SRCS} )
 +set_target_properties( cantor_rbackend PROPERTIES INSTALL_RPATH_USE_LINK_PATH false)
- target_link_libraries( cantor_rbackend ${KDE4_KDEUI_LIBS} cantorlibs ${R_USED_LIBS})
+ target_link_libraries( cantor_rbackend ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} cantorlibs ${R_USED_LIBS})
  
  install( FILES rbackend.desktop  DESTINATION ${SERVICES_INSTALL_DIR}/cantor)
-Index: kdeedu/kalzium/compoundviewer/CMakeLists.txt
-===================================================================
---- kdeedu.orig/kalzium/compoundviewer/CMakeLists.txt	2010-09-02 22:19:53.587621981 +0200
-+++ kdeedu/kalzium/compoundviewer/CMakeLists.txt	2010-09-02 22:43:16.475583999 +0200
+--- a/kalzium/compoundviewer/CMakeLists.txt
++++ b/kalzium/compoundviewer/CMakeLists.txt
 @@ -22,6 +22,7 @@
     avogadro
  )
diff --git a/debian/patches/kstars_unswap_fields_in_wizard.diff b/debian/patches/kstars_unswap_fields_in_wizard.diff
deleted file mode 100644
index bf3b809..0000000
--- a/debian/patches/kstars_unswap_fields_in_wizard.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Frédéric Brière <fbriere at fbriere.net>
-From: Modestas Vainius <modax at debian.org>
-Subject: unswap Province/Country fields in kstars startup wizard
-Forwarded: no
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=593159
-Last-Update: 2010-09-13
-Applied-Upstream: 4.6.0
-
-The Province and Country fields are swapped in the startup wizard;
-typing text in one will filter the other.  This error is quite obvious
-when looking at lines 171-172 of kswizard.cpp:
-
-  hasPrefix( loc->translatedCountry(),  location->ProvinceFilter->text() ) &&
-  hasPrefix( loc->translatedProvince(), location->CountryFilter->text()  )
-
---- a/kstars/kstars/kswizard.cpp
-+++ b/kstars/kstars/kswizard.cpp
-@@ -156,8 +156,8 @@ void KSWizard::slotFilterCities() {
- 
-     foreach ( GeoLocation *loc, KStarsData::Instance()->getGeoList() ) {
-         if( hasPrefix( loc->translatedName(),     location->CityFilter->text()     ) &&
--            hasPrefix( loc->translatedCountry(),  location->ProvinceFilter->text() ) &&
--            hasPrefix( loc->translatedProvince(), location->CountryFilter->text()  )
-+            hasPrefix( loc->translatedProvince(), location->ProvinceFilter->text() ) &&
-+            hasPrefix( loc->translatedCountry(),  location->CountryFilter->text()  )
-             )
-         {
-             location->CityListBox->insertItem( loc->fullName() );
diff --git a/debian/patches/series b/debian/patches/series
index 610093a..8a29c1a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_step_needs_-lcln.diff
 02_no_install_rpath_use_link_path.diff
-kstars_unswap_fields_in_wizard.diff

-- 
KDE Education module packaging



More information about the pkg-kde-commits mailing list