rev 13045 - branches/kde4.2/packages/kdenetwork/debian

Modestas Vainius modax-guest at alioth.debian.org
Sat Dec 27 20:40:17 UTC 2008 

Author: modax-guest
Date: 2008-12-27 20:40:17 +0000 (Sat, 27 Dec 2008)
New Revision: 13045

Added:
   branches/kde4.2/packages/kdenetwork/debian/libkopete-dev.install
   branches/kde4.2/packages/kdenetwork/debian/libkopete4.install
   branches/kde4.2/packages/kdenetwork/debian/not-installed
Removed:
   branches/kde4.2/packages/kdenetwork/debian/kdenetwork-dev.install
Modified:
   branches/kde4.2/packages/kdenetwork/debian/changelog
   branches/kde4.2/packages/kdenetwork/debian/control
   branches/kde4.2/packages/kdenetwork/debian/installgen
   branches/kde4.2/packages/kdenetwork/debian/kopete.install
   branches/kde4.2/packages/kdenetwork/debian/krdc.install
   branches/kde4.2/packages/kdenetwork/debian/rules
Log:
New snapshot, libkopete split

Modified: branches/kde4.2/packages/kdenetwork/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdenetwork/debian/changelog	2008-12-27 18:12:01 UTC (rev 13044)
+++ branches/kde4.2/packages/kdenetwork/debian/changelog	2008-12-27 20:40:17 UTC (rev 13045)
@@ -1,30 +1,35 @@
-kdenetwork (4:4.1.85+svn897981-0r1) UNRELEASED; urgency=low
+kdenetwork (4:4.1.86+svn902233-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
-  TODO: libkopete*, libkopete-dev.
-
   +++ Changes by Modestas Vainius:
 
   * Drop cmake from build depends.
-  * Bump KDE build depends to 4:4.1.80.
+  * Bump KDE build depends to 4:4.1.85.
   * Drop 97_fix_target_link_libraries.diff patch. No longer needed.
   * Bump Standards-Version to 3.8.0: add README.source.
   * New Kopete features require new build depends:
     - libortp7-dev, libspeex-dev, libasound2-dev for Jingle support.
     - remove libdecibel-dev build dependency. Advertized, but unused.
     - libmeanwhile-dev for Meanwhile protocol support.
-    - libmsn (>= 4.0~beta1+svn079) for Windows Live Messenger (and MSN) support.
+    - libmsn (>= 4.0~beta2) for Windows Live Messenger (and MSN) support.
+  * Split off Kopete library and its development files:
+    - libkopete4 - Kopete library, from kopete package;
+    - libkopete-dev - Kopete library development files, from kdenetwork-dev
+      package;
+    - kill kdenetwork-dev package, does not contain anything useful anymore.
+      libkopete-dev conflits & replaces earlier kdenetwork-dev.
   * Remove knewsticker, dropped upstream.
   * Add debian/installgen.
   * Update install files.
+  * Build depend on libxtst-dev (needed for krfb).
 
   +++ Changes by George Kiagiadakis:
 
   * Fix permissions and owners for kppp to make it work again.
-  * kdenetwork-dev now depends on kdelibs5-dev instead of kdebase-dev.
+  * libkopete-dev depends on kdelibs5-dev instead of kdebase-dev.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Dec 2008 22:48:29 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Dec 2008 22:26:06 +0200
 
 kdenetwork (4:4.1.3-1) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdenetwork/debian/control
===================================================================
--- branches/kde4.2/packages/kdenetwork/debian/control	2008-12-27 18:12:01 UTC (rev 13044)
+++ branches/kde4.2/packages/kdenetwork/debian/control	2008-12-27 20:40:17 UTC (rev 13045)
@@ -4,13 +4,13 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 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>, Modestas Vainius <modestas at vainius.eu>, Matthew Rosewarne <mrosewarne at inoutbox.com>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt,
- kdelibs5-dev (>= 4:4.1.80), kdepimlibs5-dev (>= 4:4.1.80), libplasma-dev (>= 4:4.1.80),
+ kdelibs5-dev (>= 4:4.1.85), kdepimlibs5-dev (>= 4:4.1.85), libplasma-dev (>= 4:4.1.85),
  zlib1g-dev, libjpeg62-dev, libxml2-dev, libxslt1-dev, libssl-dev,
- libxdamage-dev, libxss-dev, libslp-dev, libiw-dev, libidn11-dev,
+ libxdamage-dev, libxss-dev, libslp-dev, libiw-dev, libidn11-dev, libxtst-dev,
  libvncserver-dev (>= 0.9.3), libqca2-dev (>= 2.0.0),
  libsqlite3-dev, libqimageblitz-dev (>= 1:0.0.4),
  libgmp3-dev, libotr2-dev, libboost-dev,
- libavahi-compat-libdnssd-dev, libmeanwhile-dev, libmsn-dev (>= 4.0~beta1+svn079),
+ libavahi-compat-libdnssd-dev, libmeanwhile-dev, libmsn-dev (>= 4.0~beta2),
  libortp7-dev, libspeex-dev, libasound2-dev (>= 1.0.14a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
 Standards-Version: 3.8.0
 Homepage: http://www.kde.org/
@@ -45,14 +45,6 @@
  .
  This package is part of the KDE 4 networking module.
 
-Package: kdenetwork-dev
-Section: devel
-Architecture: any
-Depends: kopete (= ${binary:Version}), ${sameVersionDep:kdelibs5-dev:kopete}
-Description: development files for the KDE 4 networking module
- This package contains development files for building software that uses
- libraries from the KDE 4 networking module.
-
 Package: kget
 Section: net
 Architecture: any
@@ -65,6 +57,21 @@
  .
  This package is part of the KDE 4 networking module.
 
+Package: libkopete4
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kopete (<< 4:4.1.86)
+Description: main Kopete library
+ Kopete is an instant messaging and chat application with support for a wide
+ variety of services, such as AIM, Yahoo, ICQ, MSN, IRC, and Jabber.  Advanced
+ features and additional protocols are available as plugins.
+ .
+ This package contains main Kopete library which is used by Kopete and its
+ plugins.
+ .
+ This package is part of the KDE 4 networking module.
+
 Package: kopete
 Section: kde
 Architecture: any
@@ -78,6 +85,21 @@
  .
  This package is part of the KDE 4 networking module.
 
+Package: libkopete-dev
+Section: devel
+Architecture: any
+Depends: libkopete4 (= ${binary:Version}), ${sameVersionDep:kdelibs5-dev:libkopete4}
+Replaces: kdenetwork-dev (<< 4:4.1.86)
+Conflicts: kdenetwork-dev (<< 4:4.1.86)
+Description: development files for the KDE 4 networking module
+ Kopete is an instant messaging and chat application with support for a wide
+ variety of services, such as AIM, Yahoo, ICQ, MSN, IRC, and Jabber. Advanced
+ features and additional protocols are available as plugins.
+ .
+ This package contains development files needed for building Kopete plugins.
+ .
+ This package is part of the KDE 4 networking module.
+
 Package: kppp
 Section: net
 Architecture: any
@@ -94,6 +116,7 @@
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}
+Replaces: kopete (<< 4:4.1.86)
 Recommends: rdesktop
 Suggests: khelpcenter, krfb
 Description: Remote Desktop Connection client for KDE 4
@@ -140,5 +163,5 @@
  the 169.254.0.0/16 range semi-randomly.
  .
  Keywords: avahi, dnssd.
- . 
+ .
  This package is part of the KDE 4 networking module.

Modified: branches/kde4.2/packages/kdenetwork/debian/installgen
===================================================================
--- branches/kde4.2/packages/kdenetwork/debian/installgen	2008-12-27 18:12:01 UTC (rev 13044)
+++ branches/kde4.2/packages/kdenetwork/debian/installgen	2008-12-27 20:40:17 UTC (rev 13045)
@@ -1,25 +1,35 @@
 [kdenetwork-filesharing]
-from:\bfilesharing/
+from:/filesharing/
 
-[kdenetwork-dev]
-dst:usr/include
-dst:usr/lib/lib[^/]+\.so$ link:usr/lib/lib[^/]+\.so\.
-dst:/dbus-1/interfaces/
+[libkopete4]
+from:/kopete/libkopete/ dst:usr/lib/libkopete\.so\.4(?:$|\.)
 
+[libkopete-dev]
+from:/kopete/libkopete/ dst:usr/include/kopete
+from:/kopete/libkopete/ dst:usr/lib/libkopete.so link:
+from:/kopete/ dst:/dbus-1/interfaces/
+from:/kopete/libkopete/ dst:\.pc$
+from:/kopete/libkopete/ dst:\.cmake$
+
+[kdenetwork-dev_virtual]
+# Useless "development" files
+missing dst:usr/lib/lib[^/]+\.so$ link:usr/lib/lib[^/]+\.so\.
+missing dst:/dbus-1/interfaces/
+
 [kget]
-from:\bkget/
+from:/kget/
 
 [kopete]
-from:\bkopete/
+from:/kopete/
 
 [kppp]
-from:\bkppp/
+from:/kppp/
 
 [krdc]
-from:\bkrdc/
+from:/krdc/
 
 [krfb]
-from:\bkrfb/
+from:/krfb/
 
 [kde-zeroconf]
-from:\bkdnssd/
+from:/kdnssd/

Deleted: branches/kde4.2/packages/kdenetwork/debian/kdenetwork-dev.install

Modified: branches/kde4.2/packages/kdenetwork/debian/kopete.install
===================================================================
--- branches/kde4.2/packages/kdenetwork/debian/kopete.install	2008-12-27 18:12:01 UTC (rev 13044)
+++ branches/kde4.2/packages/kdenetwork/debian/kopete.install	2008-12-27 20:40:17 UTC (rev 13045)
@@ -59,8 +59,6 @@
 usr/lib/libgadu_kopete.so.1.0.0
 usr/lib/libiris_kopete.so.1
 usr/lib/libiris_kopete.so.1.0.0
-usr/lib/libkopete.so.4
-usr/lib/libkopete.so.4.2.0
 usr/lib/libkopete_oscar.so.4
 usr/lib/libkopete_oscar.so.4.2.0
 usr/lib/libkopete_otr_shared.so.1
@@ -610,8 +608,8 @@
 usr/share/kde4/config.kcfg/latexconfig.kcfg
 usr/share/kde4/config.kcfg/nowlisteningconfig.kcfg
 usr/share/kde4/config.kcfg/urlpicpreview.kcfg
+usr/share/kde4/config.kcfg/webpresenceconfig.kcfg
 usr/share/kde4/config/kopeterc
-usr/share/kde4/services/ServiceMenus/smb2rdc.desktop
 usr/share/kde4/services/aim.protocol
 usr/share/kde4/services/chatwindow.desktop
 usr/share/kde4/services/emailwindow.desktop

Modified: branches/kde4.2/packages/kdenetwork/debian/krdc.install
===================================================================
--- branches/kde4.2/packages/kdenetwork/debian/krdc.install	2008-12-27 18:12:01 UTC (rev 13044)
+++ branches/kde4.2/packages/kdenetwork/debian/krdc.install	2008-12-27 20:40:17 UTC (rev 13045)
@@ -17,5 +17,6 @@
 usr/share/kde4/apps/krdc/pics/pointcursor.png
 usr/share/kde4/apps/krdc/pics/pointcursormask.png
 usr/share/kde4/config.kcfg/krdc.kcfg
+usr/share/kde4/services/ServiceMenus/smb2rdc.desktop
 usr/share/kde4/services/rdp.protocol
 usr/share/kde4/services/vnc.protocol

Added: branches/kde4.2/packages/kdenetwork/debian/libkopete-dev.install
===================================================================
--- branches/kde4.2/packages/kdenetwork/debian/libkopete-dev.install	                        (rev 0)
+++ branches/kde4.2/packages/kdenetwork/debian/libkopete-dev.install	2008-12-27 20:40:17 UTC (rev 13045)
@@ -0,0 +1,71 @@
+usr/include/kopete/kabcpersistence.h
+usr/include/kopete/kopete_export.h
+usr/include/kopete/kopeteaccount.h
+usr/include/kopete/kopeteaccountmanager.h
+usr/include/kopete/kopeteappearancesettings.h
+usr/include/kopete/kopeteavatarmanager.h
+usr/include/kopete/kopetebehaviorsettings.h
+usr/include/kopete/kopeteblacklister.h
+usr/include/kopete/kopetechatsession.h
+usr/include/kopete/kopetechatsessionmanager.h
+usr/include/kopete/kopetecommand.h
+usr/include/kopete/kopetecommandhandler.h
+usr/include/kopete/kopetecontact.h
+usr/include/kopete/kopetecontactlist.h
+usr/include/kopete/kopetecontactlistelement.h
+usr/include/kopete/kopetecontacttaskbase.h
+usr/include/kopete/kopetedeletecontacttask.h
+usr/include/kopete/kopeteemoticons.h
+usr/include/kopete/kopeteglobal.h
+usr/include/kopete/kopetegroup.h
+usr/include/kopete/kopeteidentity.h
+usr/include/kopete/kopeteidentitymanager.h
+usr/include/kopete/kopeteinfoevent.h
+usr/include/kopete/kopetemessage.h
+usr/include/kopete/kopetemessageevent.h
+usr/include/kopete/kopetemessagehandler.h
+usr/include/kopete/kopetemessagehandlerchain.h
+usr/include/kopete/kopetemetacontact.h
+usr/include/kopete/kopetemimetypehandler.h
+usr/include/kopete/kopeteonlinestatus.h
+usr/include/kopete/kopeteonlinestatusmanager.h
+usr/include/kopete/kopetepassword.h
+usr/include/kopete/kopetepasswordedaccount.h
+usr/include/kopete/kopetepicture.h
+usr/include/kopete/kopeteplugin.h
+usr/include/kopete/kopetepluginmanager.h
+usr/include/kopete/kopeteproperty.h
+usr/include/kopete/kopetepropertycontainer.h
+usr/include/kopete/kopeteprotocol.h
+usr/include/kopete/kopetesimplemessagehandler.h
+usr/include/kopete/kopetestatusmanager.h
+usr/include/kopete/kopetestatusmessage.h
+usr/include/kopete/kopetestatussettings.h
+usr/include/kopete/kopetetask.h
+usr/include/kopete/kopetetransfermanager.h
+usr/include/kopete/kopeteuiglobal.h
+usr/include/kopete/kopeteutils.h
+usr/include/kopete/kopeteversion.h
+usr/include/kopete/ui/accountselector.h
+usr/include/kopete/ui/addcontactpage.h
+usr/include/kopete/ui/addressbookselectordialog.h
+usr/include/kopete/ui/addressbookselectorwidget.h
+usr/include/kopete/ui/avatardialog.h
+usr/include/kopete/ui/avatarselectorwidget.h
+usr/include/kopete/ui/contactaddednotifydialog.h
+usr/include/kopete/ui/editaccountwidget.h
+usr/include/kopete/ui/kopetecontactaction.h
+usr/include/kopete/ui/kopeteinfodialog.h
+usr/include/kopete/ui/kopetelistview.h
+usr/include/kopete/ui/kopetelistviewitem.h
+usr/include/kopete/ui/kopetelistviewsearchline.h
+usr/include/kopete/ui/kopetepasswordwidget.h
+usr/include/kopete/ui/kopetestdaction.h
+usr/include/kopete/ui/kopeteview.h
+usr/include/kopete/ui/kopeteviewplugin.h
+usr/include/kopete/ui/ui_kopeteawaydialogbase.h
+usr/include/kopete/ui/ui_kopetepasswordwidgetbase.h
+usr/lib/libkopete.so
+usr/share/dbus-1/interfaces/org.kde.Kopete.xml
+usr/share/dbus-1/interfaces/org.kde.kopete.Client.xml
+usr/share/dbus-1/interfaces/org.kde.kopete.Statistics.xml

Added: branches/kde4.2/packages/kdenetwork/debian/libkopete4.install
===================================================================
--- branches/kde4.2/packages/kdenetwork/debian/libkopete4.install	                        (rev 0)
+++ branches/kde4.2/packages/kdenetwork/debian/libkopete4.install	2008-12-27 20:40:17 UTC (rev 13045)
@@ -0,0 +1,2 @@
+usr/lib/libkopete.so.4
+usr/lib/libkopete.so.4.2.0

Added: branches/kde4.2/packages/kdenetwork/debian/not-installed
===================================================================
--- branches/kde4.2/packages/kdenetwork/debian/not-installed	                        (rev 0)
+++ branches/kde4.2/packages/kdenetwork/debian/not-installed	2008-12-27 20:40:17 UTC (rev 13045)
@@ -0,0 +1,16 @@
+# Links to private libraries and DBus interface XMLs
+./usr/lib/libgadu_kopete.so
+./usr/lib/libiris_kopete.so
+./usr/lib/libkgetcore.so
+./usr/lib/libkopete_oscar.so
+./usr/lib/libkopete_otr_shared.so
+./usr/lib/libkopete_videodevice.so
+./usr/lib/libkopeteaddaccountwizard.so
+./usr/lib/libkopetechatwindow_shared.so
+./usr/lib/libkopeteidentity.so
+./usr/lib/libkopeteprivacy.so
+./usr/lib/libkopetestatusmenu.so
+./usr/lib/libkyahoo.so
+./usr/lib/liboscar.so
+./usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
+./usr/share/dbus-1/interfaces/org.kde.kppp.xml

Modified: branches/kde4.2/packages/kdenetwork/debian/rules
===================================================================
--- branches/kde4.2/packages/kdenetwork/debian/rules	2008-12-27 18:12:01 UTC (rev 13044)
+++ branches/kde4.2/packages/kdenetwork/debian/rules	2008-12-27 20:40:17 UTC (rev 13045)
@@ -4,6 +4,9 @@
 
 DEB_FIXPERMS_EXCLUDE := usr/bin/kppp
 
+#DEB_DH_MAKESHLIBS_ARGS_libkopete4 := -V'libkopete4 (>= 4:4.1.86)'
+DEB_DH_MAKESHLIBS_ARGS_libkopete4 := -V
+
 binary-install/kppp::
 	chown root:dip debian/kppp/usr/bin/kppp
 	chmod 4754 debian/kppp/usr/bin/kppp

More information about the pkg-kde-commits mailing list