rev 12130 - in branches/kde4-backports/packages/kdepimlibs/debian: . patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Wed Sep 10 20:21:43 UTC 2008
Author: ana
Date: 2008-09-10 20:21:43 +0000 (Wed, 10 Sep 2008)
New Revision: 12130
Added:
branches/kde4-backports/packages/kdepimlibs/debian/patches/01_r856767_incidence_formatter_crash_fix.diff
branches/kde4-backports/packages/kdepimlibs/debian/patches/02_no_dependency_file.diff
branches/kde4-backports/packages/kdepimlibs/debian/patches/series
Modified:
branches/kde4-backports/packages/kdepimlibs/debian/
branches/kde4-backports/packages/kdepimlibs/debian/changelog
branches/kde4-backports/packages/kdepimlibs/debian/control
branches/kde4-backports/packages/kdepimlibs/debian/rules
Log:
merge kdepimlibs for backports
Property changes on: branches/kde4-backports/packages/kdepimlibs/debian
___________________________________________________________________
Name: svn:externals
- cdbs svn://svn.debian.org/pkg-kde/branches/kde4/cdbs/
+ cdbs svn://svn.debian.org/pkg-kde/branches/kde4-backports/cdbs/
Modified: branches/kde4-backports/packages/kdepimlibs/debian/changelog
===================================================================
--- branches/kde4-backports/packages/kdepimlibs/debian/changelog 2008-09-10 19:56:30 UTC (rev 12129)
+++ branches/kde4-backports/packages/kdepimlibs/debian/changelog 2008-09-10 20:21:43 UTC (rev 12130)
@@ -1,3 +1,23 @@
+kdepimlibs (4:4.1.1-2) experimental; urgency=low
+
+ +++ Changes by Sune Vuorela:
+
+ * Pull crash fix from upstream, pushed out via kde-packager.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 08 Sep 2008 21:58:53 +0200
+
+kdepimlibs (4:4.1.1-1) experimental; urgency=low
+
+ * New upstream release.
+
+ +++ Changes by Sune Vuorela:
+
+ * Don't write the library dependencies to the pimlibs dependencies cmake
+ file. This trims some more recursive linking.
+ * Kill some dependencies of the -dev package.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 02 Sep 2008 00:25:01 +0200
+
kdepimlibs (4:4.1.0-1) unstable; urgency=low
* New upstream release.
Modified: branches/kde4-backports/packages/kdepimlibs/debian/control
===================================================================
--- branches/kde4-backports/packages/kdepimlibs/debian/control 2008-09-10 19:56:30 UTC (rev 12129)
+++ branches/kde4-backports/packages/kdepimlibs/debian/control 2008-09-10 20:21:43 UTC (rev 12130)
@@ -5,7 +5,7 @@
Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6.0),
- kdelibs5-dev (>= 4:4.1.0), libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev,
+ kdelibs5-dev (>= 4:4.1.1), libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev,
libakonadi-dev (>= 1.0.0)
Standards-Version: 3.7.3
Homepage: http://pim.kde.org/
@@ -35,7 +35,6 @@
Section: libdevel
Architecture: any
Depends: kdepimlibs5 (= ${binary:Version}), ${sameVersionDep:kdelibs5-dev},
- libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev
Conflicts: libkleopatra1-dev
Description: development files for the KDE 4 PIM libraries
This package contains development files for building software that uses
Copied: branches/kde4-backports/packages/kdepimlibs/debian/patches/01_r856767_incidence_formatter_crash_fix.diff (from rev 12129, branches/kde4/packages/kdepimlibs/debian/patches/01_r856767_incidence_formatter_crash_fix.diff)
===================================================================
--- branches/kde4-backports/packages/kdepimlibs/debian/patches/01_r856767_incidence_formatter_crash_fix.diff (rev 0)
+++ branches/kde4-backports/packages/kdepimlibs/debian/patches/01_r856767_incidence_formatter_crash_fix.diff 2008-09-10 20:21:43 UTC (rev 12130)
@@ -0,0 +1,16 @@
+backport from upstreams
+http://websvn.kde.org/branches/KDE/4.1/kdepimlibs/kcal/incidenceformatter.cpp?r1=856768&r2=856767&pathrev=856768
+as requested by upstream on kde-packager and other places.
+
+--- kdepimlibs/kcal/incidenceformatter.cpp 2008/09/03 18:28:53 856767
++++ kdepimlibs/kcal/incidenceformatter.cpp 2008/09/03 18:33:54 856768
+@@ -1132,6 +1132,9 @@
+ IncidenceCompareVisitor() : mExistingIncidence( 0 ) {}
+ bool act( IncidenceBase *incidence, Incidence *existingIncidence )
+ {
++ if (!existingIncidence) {
++ return false;
++ }
+ Incidence *inc = dynamic_cast<Incidence *>( incidence );
+ if ( inc && inc->revision() <= existingIncidence->revision() ) {
+ return false;
Copied: branches/kde4-backports/packages/kdepimlibs/debian/patches/02_no_dependency_file.diff (from rev 12129, branches/kde4/packages/kdepimlibs/debian/patches/02_no_dependency_file.diff)
===================================================================
--- branches/kde4-backports/packages/kdepimlibs/debian/patches/02_no_dependency_file.diff (rev 0)
+++ branches/kde4-backports/packages/kdepimlibs/debian/patches/02_no_dependency_file.diff 2008-09-10 20:21:43 UTC (rev 12130)
@@ -0,0 +1,13 @@
+No need to write the dependency file. it is bloated anyway.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -63,7 +63,7 @@
+
+ # ...and append all library dependencies
+ string(REGEX REPLACE "gpgmepp" "gpgme++" qgpgme_LIB_DEPENDS "${qgpgme_LIB_DEPENDS}")
+-export_library_dependencies(${CMAKE_CURRENT_BINARY_DIR}/KDEPimLibsDependencies.cmake APPEND)
++#export_library_dependencies(${CMAKE_CURRENT_BINARY_DIR}/KDEPimLibsDependencies.cmake APPEND)
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KDEPimLibsDependencies.cmake DESTINATION ${DATA_INSTALL_DIR}/cmake/modules)
+
+ macro_display_feature_log()
Copied: branches/kde4-backports/packages/kdepimlibs/debian/patches/series (from rev 12129, branches/kde4/packages/kdepimlibs/debian/patches/series)
===================================================================
--- branches/kde4-backports/packages/kdepimlibs/debian/patches/series (rev 0)
+++ branches/kde4-backports/packages/kdepimlibs/debian/patches/series 2008-09-10 20:21:43 UTC (rev 12130)
@@ -0,0 +1,2 @@
+01_r856767_incidence_formatter_crash_fix.diff
+02_no_dependency_file.diff
Modified: branches/kde4-backports/packages/kdepimlibs/debian/rules
===================================================================
--- branches/kde4-backports/packages/kdepimlibs/debian/rules 2008-09-10 19:56:30 UTC (rev 12129)
+++ branches/kde4-backports/packages/kdepimlibs/debian/rules 2008-09-10 20:21:43 UTC (rev 12130)
@@ -1,9 +1,7 @@
#!/usr/bin/make -f
-THIS_SHOULD_GO_TO_UNSTABLE=1
+UPSTREAMVERSION := 4:4.1.1
-UPSTREAMVERSION := 4:4.1.0
-
DEB_CMAKE_EXTRA_FLAGS += -DKDE4_ENABLE_EXPERIMENTAL_LIB_EXPORT=on
DEB_DH_MAKESHLIBS_ARGS_kdepimlibs5 := -V'kdepimlibs5 (>= $(UPSTREAMVERSION))'
More information about the pkg-kde-commits
mailing list