rev 16849 - in trunk/packages/akonadi/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Wed Feb 10 13:35:00 UTC 2010
Author: fabo
Date: 2010-02-10 13:34:57 +0000 (Wed, 10 Feb 2010)
New Revision: 16849
Modified:
trunk/packages/akonadi/debian/changelog
trunk/packages/akonadi/debian/control
trunk/packages/akonadi/debian/patches/01_x11_not_required.diff
trunk/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff
trunk/packages/akonadi/debian/rules
Log:
Upload Akonadi 1.3.1-1 to Sid.
Modified: trunk/packages/akonadi/debian/changelog
===================================================================
--- trunk/packages/akonadi/debian/changelog 2010-02-10 11:57:30 UTC (rev 16848)
+++ trunk/packages/akonadi/debian/changelog 2010-02-10 13:34:57 UTC (rev 16849)
@@ -1,4 +1,4 @@
-akonadi (1.3.1-1~pre1) UNRELEASED; urgency=low
+akonadi (1.3.1-1) unstable; urgency=low
* New upstream release.
@@ -21,6 +21,9 @@
* Change my email address to modax at debian.org in Uploaders field.
* Fix Vcs-Browser URL.
+ [ Fathi Boudra ]
+ * Bump Standards-Version to 3.8.4 (no changes needed).
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 30 Jan 2010 22:09:48 -0300
akonadi (1.2.1-1) unstable; urgency=low
Modified: trunk/packages/akonadi/debian/control
===================================================================
--- trunk/packages/akonadi/debian/control 2010-02-10 11:57:30 UTC (rev 16848)
+++ trunk/packages/akonadi/debian/control 2010-02-10 13:34:57 UTC (rev 16849)
@@ -7,7 +7,7 @@
Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), cmake (>= 2.6.2), automoc, quilt, pkg-kde-tools (>= 0.4),
libqt4-dev (>> 4.4.0~), shared-mime-info, libmysqlclient-dev,
libxslt-dev, libsoprano-dev (>= 2.1.1), xsltproc, libdbus-1-dev, libboost-program-options-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://pim.kde.org/akonadi
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/akonadi/#_trunk_packages_akonadi_
Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/akonadi
Modified: trunk/packages/akonadi/debian/patches/01_x11_not_required.diff
===================================================================
--- trunk/packages/akonadi/debian/patches/01_x11_not_required.diff 2010-02-10 11:57:30 UTC (rev 16848)
+++ trunk/packages/akonadi/debian/patches/01_x11_not_required.diff 2010-02-10 13:34:57 UTC (rev 16849)
@@ -1,8 +1,6 @@
-Index: akonadi-1.3.0/cmake/modules/FindQt4.cmake
-===================================================================
---- akonadi-1.3.0.orig/cmake/modules/FindQt4.cmake 2010-01-20 06:13:49.000000000 -0300
-+++ akonadi-1.3.0/cmake/modules/FindQt4.cmake 2010-01-30 18:50:11.000000000 -0300
-@@ -1342,7 +1342,7 @@
+--- a/cmake/modules/FindQt4.cmake
++++ b/cmake/modules/FindQt4.cmake
+@@ -1342,7 +1342,7 @@ IF (QT4_QMAKE_FOUND)
IF(UNIX)
# on OS X X11 may not be required
IF (Q_WS_X11)
Modified: trunk/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff
===================================================================
--- trunk/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff 2010-02-10 11:57:30 UTC (rev 16848)
+++ trunk/packages/akonadi/debian/patches/02_hardcode_debian_mysqld_path.diff 2010-02-10 13:34:57 UTC (rev 16849)
@@ -1,7 +1,5 @@
-Index: akonadi-1.3.0/server/CMakeLists.txt
-===================================================================
---- akonadi-1.3.0.orig/server/CMakeLists.txt 2010-01-30 18:54:50.000000000 -0300
-+++ akonadi-1.3.0/server/CMakeLists.txt 2010-01-30 18:55:14.000000000 -0300
+--- a/server/CMakeLists.txt
++++ b/server/CMakeLists.txt
@@ -1,5 +1,6 @@
-find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/mysql/libexec /usr/mysql/bin )
Modified: trunk/packages/akonadi/debian/rules
===================================================================
--- trunk/packages/akonadi/debian/rules 2010-02-10 11:57:30 UTC (rev 16848)
+++ trunk/packages/akonadi/debian/rules 2010-02-10 13:34:57 UTC (rev 16849)
@@ -6,5 +6,3 @@
DEB_CMAKE_EXTRA_FLAGS += -DMYSQLD_EXECUTABLE=/usr/sbin/mysqld
include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
-
-
More information about the pkg-kde-commits
mailing list