rev 10439 - in branches/kde4/packages/decibel/debian: . patches

Thu May 1 23:05:04 UTC 2008

Author: pusling-guest
Date: 2008-05-01 23:05:03 +0000 (Thu, 01 May 2008)
New Revision: 10439

Added:
   branches/kde4/packages/decibel/debian/libdecibel0.7.0.install
   branches/kde4/packages/decibel/debian/patches/
   branches/kde4/packages/decibel/debian/patches/01_fix_cmake_dont_require_x11.diff
   branches/kde4/packages/decibel/debian/patches/series
Removed:
   branches/kde4/packages/decibel/debian/libdecibel0.6.0.install
Modified:
   branches/kde4/packages/decibel/debian/changelog
   branches/kde4/packages/decibel/debian/control
   branches/kde4/packages/decibel/debian/decibel-kde4.install
   branches/kde4/packages/decibel/debian/libdecibel-dev.install
   branches/kde4/packages/decibel/debian/rules
Log:
* New snapshot
* SONAME change => package rename
* fix up install files
* merge decibel and decibel-kde4 packages, as both now uses stuff
  from kde4.

Modified: branches/kde4/packages/decibel/debian/changelog
===================================================================

--- branches/kde4/packages/decibel/debian/changelog	2008-05-01 21:46:50 UTC (rev 10438)
+++ branches/kde4/packages/decibel/debian/changelog	2008-05-01 23:05:03 UTC (rev 10439)
@@ -1,11 +1,17 @@
-decibel (0.5.0+svn737972-3) UNRELEASED; urgency=low
+decibel (0.5.0+svn803080-1) experimental; urgency=low
 
+  * New snapshot
+  * SONAME change => package rename
+  * fix up install files
+  * merge decibel and decibel-kde4 packages, as both now uses stuff
+    from kde4.
+
   +++ Changes by Matthew Rosewarne:
 
   * Tweak package descriptions.
   * Bump Standards-Version to 3.7.3.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 26 Jan 2008 17:36:02 +0100
+ -- Sune Vuorela <debian at pusling.com>  Thu, 01 May 2008 23:43:27 +0200
 
 decibel (0.5.0+svn737972-2) experimental; urgency=low
 

Modified: branches/kde4/packages/decibel/debian/control
===================================================================
--- branches/kde4/packages/decibel/debian/control	2008-05-01 21:46:50 UTC (rev 10438)
+++ branches/kde4/packages/decibel/debian/control	2008-05-01 23:05:03 UTC (rev 10439)
@@ -9,7 +9,7 @@
 Package: libdecibel-dev
 Section: libdevel
 Architecture: any
-Depends: libdecibel0.6.0 (= ${binary:Version}), libqttapioca-dev, libqttelepathy-dev
+Depends: libdecibel0.7.0 (= ${binary:Version}), libqttapioca-dev, libqttelepathy-dev
 Description: development files for the Decibel communications framework
  Decibel is a real-time communications framework, which manages services such
  as Computer Telephony Integration (CTI), Voice over Internet Protocol (VoIP),
@@ -19,7 +19,7 @@
  This package contains development files for building software that uses the
  Decibel libraries.
 
-Package: libdecibel0.6.0
+Package: libdecibel0.7.0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -34,6 +34,9 @@
 Package: decibel
 Section: libs
 Architecture: any
+Conflicts: decibel-kde4
+Provides: decibel-kde4
+Replaces: decibel-kde4
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: executables for the Decibel communications framework
  Decibel is a real-time communications framework, which manages services such
@@ -41,16 +44,5 @@
  text-based chat, and instant messaging.  It provides a simple D-Bus interface
  for communication protocols, accounts, contacts, and desktop components.
  .
- This package contains programs the Decibel D-Bus service.
-
-Package: decibel-kde4
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: KDE 4 desktop components for the Decibel communications framework
- Decibel is a real-time communications framework, which manages services such
- as Computer Telephony Integration (CTI), Voice over Internet Protocol (VoIP),
- text-based chat, and instant messaging.  It provides a simple D-Bus interface
- for communication protocols, accounts, contacts, and desktop components.
- .
- This package contains Decibel desktop components for KDE 4.
+ This package contains programs the Decibel D-Bus service. and the Decibel 
+ desktop components for KDE 4.

Modified: branches/kde4/packages/decibel/debian/decibel-kde4.install
===================================================================
--- branches/kde4/packages/decibel/debian/decibel-kde4.install	2008-05-01 21:46:50 UTC (rev 10438)
+++ branches/kde4/packages/decibel/debian/decibel-kde4.install	2008-05-01 23:05:03 UTC (rev 10439)
@@ -1,5 +1,4 @@
 usr/share/kde4/services/kcm_decibel_accountmanager.desktop
-usr/share/dbus-1/services/de.basyskom.minigui.service
-usr/share/Decibel/components/de.basyskom.minigui.streamchannel.component
 usr/lib/kde4/kcm_decibel_accountmanager.so
 usr/bin/minigui
+usr/bin/textchannelgui

Modified: branches/kde4/packages/decibel/debian/libdecibel-dev.install
===================================================================
--- branches/kde4/packages/decibel/debian/libdecibel-dev.install	2008-05-01 21:46:50 UTC (rev 10438)
+++ branches/kde4/packages/decibel/debian/libdecibel-dev.install	2008-05-01 23:05:03 UTC (rev 10439)
@@ -3,7 +3,6 @@
 usr/include/Decibel/protocolmanager.h
 usr/include/Decibel/dbusnames.h
 usr/include/Decibel/ComponentManager
-usr/include/Decibel/ChannelHandler
 usr/include/Decibel/componentmanager.h
 usr/include/Decibel/Errors
 usr/include/Decibel/channelhandler.h

Deleted: branches/kde4/packages/decibel/debian/libdecibel0.6.0.install

Added: branches/kde4/packages/decibel/debian/libdecibel0.7.0.install
===================================================================
--- branches/kde4/packages/decibel/debian/libdecibel0.7.0.install	                        (rev 0)
+++ branches/kde4/packages/decibel/debian/libdecibel0.7.0.install	2008-05-01 23:05:03 UTC (rev 10439)
@@ -0,0 +1,24 @@
+usr/lib/Decibel/decibel_phonestarter_demo
+usr/lib/Decibel/decibel_defaultcmfor_demo
+usr/lib/Decibel/decibel_listcmsfor_demo
+usr/lib/Decibel/decibel_setpresence_demo
+usr/lib/Decibel/decibel_chatstarter_demo
+usr/lib/Decibel/decibel_setdefaultcmfor_demo
+usr/lib/Decibel/decibel_registeraccount_demo
+usr/lib/Decibel/decibel_listaccounts_demo
+usr/lib/Decibel/decibel_deleteaccount_demo
+usr/lib/Decibel/decibel_listcms_demo
+usr/lib/Decibel/decibel_supportedprotocols_demo
+usr/lib/Decibel/decibel_simpleclient_demo
+usr/share/doc/Decibel/demos.html
+usr/lib/libdecibel.so.0.7.0
+usr/share/Decibel/components/org.kde.Decibel.Log.component
+usr/share/Decibel/components/org.kde.MiniGUI.StreamChannel.component
+usr/share/Decibel/components/org.kde.SimpleClient.TextChannel.component
+usr/share/Decibel/components/org.kde.textchannelgui.TextChannel.component
+usr/share/dbus-1/services/org.kde.Decibel.Daemon.service
+usr/share/dbus-1/services/org.kde.Decibel.Log.service
+usr/share/dbus-1/services/org.kde.MiniGUI.service
+usr/share/dbus-1/services/org.kde.SimpleClient.service
+usr/share/dbus-1/services/org.kde.textchannelgui.service
+

Added: branches/kde4/packages/decibel/debian/patches/01_fix_cmake_dont_require_x11.diff
===================================================================
--- branches/kde4/packages/decibel/debian/patches/01_fix_cmake_dont_require_x11.diff	                        (rev 0)
+++ branches/kde4/packages/decibel/debian/patches/01_fix_cmake_dont_require_x11.diff	2008-05-01 23:05:03 UTC (rev 10439)
@@ -0,0 +1,13 @@
+Index: b/cmake/modules/FindQt4.cmake
+===================================================================
+--- a/cmake/modules/FindQt4.cmake
++++ b/cmake/modules/FindQt4.cmake
+@@ -1184,7 +1184,7 @@
+   IF(UNIX)
+     # on OS X X11 may not be required
+     IF (Q_WS_X11)
+-      FIND_PACKAGE(X11 REQUIRED)
++      FIND_PACKAGE(X11)
+     ENDIF (Q_WS_X11)
+     FIND_PACKAGE(Threads)
+     SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})

Added: branches/kde4/packages/decibel/debian/patches/series
===================================================================
--- branches/kde4/packages/decibel/debian/patches/series	                        (rev 0)
+++ branches/kde4/packages/decibel/debian/patches/series	2008-05-01 23:05:03 UTC (rev 10439)
@@ -0,0 +1 @@
+01_fix_cmake_dont_require_x11.diff

Modified: branches/kde4/packages/decibel/debian/rules
===================================================================
--- branches/kde4/packages/decibel/debian/rules	2008-05-01 21:46:50 UTC (rev 10438)
+++ branches/kde4/packages/decibel/debian/rules	2008-05-01 23:05:03 UTC (rev 10439)
@@ -1,2 +1,6 @@
 #! /usr/bin/make -f
 include debian/cdbs/kde.mk
+DEB_QUILT_PATCHDIR_LINK:=debian/patches
+
+clean::
+	rm -f debian/patches/patches


