[Pkg-kde-commits] rev 1168 - branches/kde-3.4.0/packages/kdenetwork/debian

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-05-31 15:55:38 +0000 (Tue, 31 May 2005)
New Revision: 1168

Added:
   branches/kde-3.4.0/packages/kdenetwork/debian/kdenetwork-dev.install
Removed:
   branches/kde-3.4.0/packages/kdenetwork/debian/librss1-dev.install
Modified:
   branches/kde-3.4.0/packages/kdenetwork/debian/changelog
   branches/kde-3.4.0/packages/kdenetwork/debian/control
Log:
Merge librss1-dev and the kopete headers into kdenetwork-dev.

If people want this done differently, no problem - it's really easy to
change revert. But I did recall a brief discussion, and no one objected,
so here goes...

(we should make this change before the experimental upload, since it
requires NEW processing).


Modified: branches/kde-3.4.0/packages/kdenetwork/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-05-31 00:38:45 UTC (rev 1167)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-05-31 15:55:38 UTC (rev 1168)
@@ -2,8 +2,13 @@
 
   * New upstream release 
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 24 May 2005 17:18:33 +0200
+  +++ Changes by Christopher Martin:
 
+  * Merge librss1-dev and currently unused kopete headers into a general
+    kdenetwork-dev package.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 31 May 2005 11:47:36 -0400
+
 kdenetwork (4:3.4.0-0pre2) alioth; urgency=low
 
   * New upstream release.

Modified: branches/kde-3.4.0/packages/kdenetwork/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/control	2005-05-31 00:38:45 UTC (rev 1167)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/control	2005-05-31 15:55:38 UTC (rev 1168)
@@ -271,13 +271,15 @@
  This package is part of KDE, as a component of the KDE network module.
  See the 'kde' and 'kdenetwork' packages for more information.
 
-Package: librss1-dev
-Section: libdevel
+Package: kdenetwork-dev
+Section: devel
 Architecture: any
-Depends: librss1 (=${Source-Version})
-Description: development files for the KDE RSS library
+Depends: kopete (=${Source-Version}), librss1 (=${Source-Version})
+Replaces: librss1-dev
+Description: development files for the KDE network module
  This is the development package which contains the headers for the KDE RSS
- library.
+ library as well as the Kopete chat client, as well as miscellaneous
+ development-related files for the KDE network module.
  .
  This package is part of KDE, as a component of the KDE network module.
  See the 'kde' and 'kdenetwork' packages for more information.

Copied: branches/kde-3.4.0/packages/kdenetwork/debian/kdenetwork-dev.install (from rev 1166, branches/kde-3.4.0/packages/kdenetwork/debian/librss1-dev.install)
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/librss1-dev.install	2005-05-30 12:55:30 UTC (rev 1166)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/kdenetwork-dev.install	2005-05-31 15:55:38 UTC (rev 1168)
@@ -0,0 +1,68 @@
+debian/tmp/usr/include/kde/rss/article.h
+debian/tmp/usr/include/kde/rss/document.h
+debian/tmp/usr/include/kde/rss/global.h
+debian/tmp/usr/include/kde/rss/image.h
+debian/tmp/usr/include/kde/rss/librss.h
+debian/tmp/usr/include/kde/rss/loader.h
+debian/tmp/usr/include/kde/rss/textinput.h
+debian/tmp/usr/lib/librss.la
+debian/tmp/usr/lib/librss.so
+debian/tmp/usr/lib/libkopete_msn_shared.la
+debian/tmp/usr/lib/libkopete_msn_shared.so
+debian/tmp/usr/lib/libkdeinit_ksirc.la
+debian/tmp/usr/lib/libkopete_oscar.la
+debian/tmp/usr/lib/libkopete_oscar.so
+debian/tmp/usr/lib/libkopete.la
+debian/tmp/usr/lib/libkopete.so
+debian/tmp/usr/include/kde/kopete/kopeteplugin.h
+debian/tmp/usr/include/kde/kopete/kopetemessage.h
+debian/tmp/usr/include/kde/kopete/kopetecontactlist.h
+debian/tmp/usr/include/kde/kopete/kopetepasswordedaccount.h
+debian/tmp/usr/include/kde/kopete/kopeteblacklister.h
+debian/tmp/usr/include/kde/kopete/kopetenotifydataobject.h
+debian/tmp/usr/include/kde/kopete/kopeteawaydialog.h
+debian/tmp/usr/include/kde/kopete/kopetecontactlistelement.h
+debian/tmp/usr/include/kde/kopete/managedconnectionaccount.h
+debian/tmp/usr/include/kde/kopete/kabcpersistence.h
+debian/tmp/usr/include/kde/kopete/kopetecommandhandler.h
+debian/tmp/usr/include/kde/kopete/kopeteonlinestatus.h
+debian/tmp/usr/include/kde/kopete/kopetepassword.h
+debian/tmp/usr/include/kde/kopete/kopeteaway.h
+debian/tmp/usr/include/kde/kopete/kopetemimetypehandler.h
+debian/tmp/usr/include/kde/kopete/kopetemetacontact.h
+debian/tmp/usr/include/kde/kopete/kopeteglobal.h
+debian/tmp/usr/include/kde/kopete/kopeteaccountmanager.h
+debian/tmp/usr/include/kde/kopete/kopetecontactproperty.h
+debian/tmp/usr/include/kde/kopete/kopetesimplemessagehandler.h
+debian/tmp/usr/include/kde/kopete/kopetetask.h
+debian/tmp/usr/include/kde/kopete/kopetemessageevent.h
+debian/tmp/usr/include/kde/kopete/kopetecontact.h
+debian/tmp/usr/include/kde/kopete/kopeteprotocol.h
+debian/tmp/usr/include/kde/kopete/kopetegroup.h
+debian/tmp/usr/include/kde/kopete/kopeteaccount.h
+debian/tmp/usr/include/kde/kopete/kopetemessagemanagerfactory.h
+debian/tmp/usr/include/kde/kopete/kopete_export.h
+debian/tmp/usr/include/kde/kopete/kopeteuiglobal.h
+debian/tmp/usr/include/kde/kopete/kopetetransfermanager.h
+debian/tmp/usr/include/kde/kopete/kopetemessagemanager.h
+debian/tmp/usr/include/kde/kopete/kopeteonlinestatusmanager.h
+debian/tmp/usr/include/kde/kopete/kopeteawayaction.h
+debian/tmp/usr/include/kde/kopete/kopetexsl.h
+debian/tmp/usr/include/kde/kopete/kopeteeventpresentation.h
+debian/tmp/usr/include/kde/kopete/kopetemessagehandlerchain.h
+debian/tmp/usr/include/kde/kopete/kopetenotifyclient.h
+debian/tmp/usr/include/kde/kopete/kopetemessagehandler.h
+debian/tmp/usr/include/kde/kopete/ui/fileconfirmbase.h
+debian/tmp/usr/include/kde/kopete/ui/kopeteawaydialogbase.h
+debian/tmp/usr/include/kde/kopete/ui/kopetepasswordwidget.h
+debian/tmp/usr/include/kde/kopete/ui/kopetestdaction.h
+debian/tmp/usr/include/kde/kopete/ui/userinfodialog.h
+debian/tmp/usr/include/kde/kopete/ui/kopetepasswordwidgetbase.h
+debian/tmp/usr/include/kde/kopete/ui/kopeteview.h
+debian/tmp/usr/include/kde/kopete/ui/kopeteviewplugin.h
+debian/tmp/usr/include/kde/kopete/ui/accountselector.h
+debian/tmp/usr/include/kde/kopete/ui/editaccountwidget.h
+debian/tmp/usr/include/kde/kopete/ui/addcontactpage.h
+debian/tmp/usr/include/kde/kopete/ui/kopetepassworddialog.h
+debian/tmp/usr/include/kde/kopete/ui/kopetefileconfirmdialog.h
+debian/tmp/usr/include/kde/kopete/ui/kopetecontactaction.h

Deleted: branches/kde-3.4.0/packages/kdenetwork/debian/librss1-dev.install