rev 10270 - in branches/kde4/packages/akonadi/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-04-25 15:28:31 +0000 (Fri, 25 Apr 2008)
New Revision: 10270

Modified:
   branches/kde4/packages/akonadi/debian/akonadi-server.install
   branches/kde4/packages/akonadi/debian/akonadi-server.installgen
   branches/kde4/packages/akonadi/debian/libakonadi-dev.install
   branches/kde4/packages/akonadi/debian/libakonadi-dev.installgen
   branches/kde4/packages/akonadi/debian/patches/01_x11_not_required.diff
Log:
* Move dbus *.xml from akonadi-server to libakonadi-dev
* FIx 01_ patch offset

Modified: branches/kde4/packages/akonadi/debian/akonadi-server.install
===================================================================
--- branches/kde4/packages/akonadi/debian/akonadi-server.install	2008-04-25 13:31:24 UTC (rev 10269)
+++ branches/kde4/packages/akonadi/debian/akonadi-server.install	2008-04-25 15:28:31 UTC (rev 10270)
@@ -1,18 +1,6 @@
+etc/akonadi/mysql-global.conf
+usr/bin/akonadi_control
 usr/bin/akonadictl
 usr/bin/akonadiserver
-usr/bin/akonadi_control
-usr/share/mime/packages/akonadi-mime.xml
 usr/share/dbus-1/services/org.kde.Akonadi.Control.service
-usr/share/dbus-1/interfaces/org.kde.Akonadi.SearchQuery.xml
-usr/share/dbus-1/interfaces/org.kde.Akonadi.Server.xml
-usr/share/dbus-1/interfaces/org.kde.Akonadi.ControlManager.xml
-usr/share/dbus-1/interfaces/org.kde.Akonadi.NotificationManager.xml
-usr/share/dbus-1/interfaces/org.kde.Akonadi.Agent.Control.xml
-usr/share/dbus-1/interfaces/org.kde.Akonadi.SearchQueryIterator.xml
-usr/share/dbus-1/interfaces/org.kde.Akonadi.AgentManager.xml
-usr/share/dbus-1/interfaces/org.kde.Akonadi.Search.xml
-usr/share/dbus-1/interfaces/org.kde.Akonadi.Agent.Status.xml
-usr/share/dbus-1/interfaces/org.kde.Akonadi.Tracer.xml
-usr/share/dbus-1/interfaces/org.kde.Akonadi.Resource.xml
-usr/share/dbus-1/interfaces/org.kde.Akonadi.TracerNotification.xml
-etc/akonadi/mysql-global.conf
+usr/share/mime/packages/akonadi-mime.xml

Modified: branches/kde4/packages/akonadi/debian/akonadi-server.installgen
===================================================================
--- branches/kde4/packages/akonadi/debian/akonadi-server.installgen	2008-04-25 13:31:24 UTC (rev 10269)
+++ branches/kde4/packages/akonadi/debian/akonadi-server.installgen	2008-04-25 15:28:31 UTC (rev 10270)
@@ -1,3 +1,6 @@
+# Install dbus XMLs to libakonadi-dev first
+depends libakonadi-dev
+
 dst:usr/bin
 dst:etc/
 dst:usr/share

Modified: branches/kde4/packages/akonadi/debian/libakonadi-dev.install
===================================================================
--- branches/kde4/packages/akonadi/debian/libakonadi-dev.install	2008-04-25 13:31:24 UTC (rev 10269)
+++ branches/kde4/packages/akonadi/debian/libakonadi-dev.install	2008-04-25 15:28:31 UTC (rev 10270)
@@ -1,8 +1,20 @@
-usr/include/akonadi/private/xdgbasedirs_p.h
-usr/include/akonadi/private/protocol_p.h
 usr/include/akonadi/private/akonadiprotocolinternals_export.h
+usr/include/akonadi/private/imapparser_p.h
 usr/include/akonadi/private/imapset_p.h
-usr/include/akonadi/private/imapparser_p.h
 usr/include/akonadi/private/notificationmessage_p.h
+usr/include/akonadi/private/protocol_p.h
+usr/include/akonadi/private/xdgbasedirs_p.h
 usr/lib/libakonadiprivate.so
 usr/lib/libakonadiprotocolinternals.so
+usr/share/dbus-1/interfaces/org.kde.Akonadi.Agent.Control.xml
+usr/share/dbus-1/interfaces/org.kde.Akonadi.Agent.Status.xml
+usr/share/dbus-1/interfaces/org.kde.Akonadi.AgentManager.xml
+usr/share/dbus-1/interfaces/org.kde.Akonadi.ControlManager.xml
+usr/share/dbus-1/interfaces/org.kde.Akonadi.NotificationManager.xml
+usr/share/dbus-1/interfaces/org.kde.Akonadi.Resource.xml
+usr/share/dbus-1/interfaces/org.kde.Akonadi.Search.xml
+usr/share/dbus-1/interfaces/org.kde.Akonadi.SearchQuery.xml
+usr/share/dbus-1/interfaces/org.kde.Akonadi.SearchQueryIterator.xml
+usr/share/dbus-1/interfaces/org.kde.Akonadi.Server.xml
+usr/share/dbus-1/interfaces/org.kde.Akonadi.Tracer.xml
+usr/share/dbus-1/interfaces/org.kde.Akonadi.TracerNotification.xml

Modified: branches/kde4/packages/akonadi/debian/libakonadi-dev.installgen
===================================================================
--- branches/kde4/packages/akonadi/debian/libakonadi-dev.installgen	2008-04-25 13:31:24 UTC (rev 10269)
+++ branches/kde4/packages/akonadi/debian/libakonadi-dev.installgen	2008-04-25 15:28:31 UTC (rev 10270)
@@ -1,2 +1,3 @@
 dst:usr/include
 dst:usr/lib/.*\.so$
+dst:usr/share/dbus.*/interfaces/.*\.xml$

Modified: branches/kde4/packages/akonadi/debian/patches/01_x11_not_required.diff
===================================================================
--- branches/kde4/packages/akonadi/debian/patches/01_x11_not_required.diff	2008-04-25 13:31:24 UTC (rev 10269)
+++ branches/kde4/packages/akonadi/debian/patches/01_x11_not_required.diff	2008-04-25 15:28:31 UTC (rev 10270)
@@ -1,6 +1,6 @@
 --- a/cmake/modules/FindQt4.cmake
 +++ b/cmake/modules/FindQt4.cmake
-@@ -1211,7 +1211,7 @@
+@@ -1341,7 +1341,7 @@
    IF(UNIX)
      # on OS X X11 may not be required
      IF (Q_WS_X11)