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

[Isaac Clerencia]

Author: isaac
Date: 2005-03-05 02:32:53 +0100 (Sat, 05 Mar 2005)
New Revision: 662

Modified:
   branches/kde-3.4.0/packages/kdenetwork/debian/changelog
   branches/kde-3.4.0/packages/kdenetwork/debian/control
   branches/kde-3.4.0/packages/kdenetwork/debian/kopete.install
   branches/kde-3.4.0/packages/kdenetwork/debian/kopete.manpages
   branches/kde-3.4.0/packages/kdenetwork/debian/rules
Log:
Calculate shlibdeps for kopete plugins in a better way (taken from kdepim)
Fix manpage location in kopete.manpages
Change kopete_oscar.so filename in kopete.install (SONAME changed)
Change debian release to -0pre1


Modified: branches/kde-3.4.0/packages/kdenetwork/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-03-05 01:09:08 UTC (rev 661)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-03-05 01:32:53 UTC (rev 662)
@@ -1,4 +1,4 @@
-kdenetwork (4:3.4.0-1) experimental; urgency=low
+kdenetwork (4:3.4.0-0pre1) experimental; 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-03-05 01:09:08 UTC (rev 661)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/control	2005-03-05 01:32:53 UTC (rev 662)
@@ -102,7 +102,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: qca-tls
-Suggests: khelpcenter, xmms
+Suggests: khelpcenter, ${shlibs:Suggests}
 Replaces: konversation (<= 0.14.0-4), sim (<= 0.9.3-2)
 Description: Instant messenger program
  KDE is a powerful Open Source graphical desktop environment for Unix

Modified: branches/kde-3.4.0/packages/kdenetwork/debian/kopete.install
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/kopete.install	2005-03-05 01:09:08 UTC (rev 661)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/kopete.install	2005-03-05 01:32:53 UTC (rev 662)
@@ -80,8 +80,8 @@
 debian/tmp/usr/lib/libkopete.so.1.0.0
 debian/tmp/usr/lib/libkopete_msn_shared.so.0
 debian/tmp/usr/lib/libkopete_msn_shared.so.0.0.0
-debian/tmp/usr/lib/libkopete_oscar.so.1
-debian/tmp/usr/lib/libkopete_oscar.so.1.0.0
+debian/tmp/usr/lib/libkopete_oscar.so.2
+debian/tmp/usr/lib/libkopete_oscar.so.2.0.0
 debian/tmp/usr/share/applications/kde/kopete.desktop
 debian/tmp/usr/share/apps/kconf_update/kopete-account-kconf_update.sh
 debian/tmp/usr/share/apps/kconf_update/kopete-account-kconf_update.upd

Modified: branches/kde-3.4.0/packages/kdenetwork/debian/kopete.manpages
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/kopete.manpages	2005-03-05 01:09:08 UTC (rev 661)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/kopete.manpages	2005-03-05 01:32:53 UTC (rev 662)
@@ -1 +1 @@
-debian/man/kopete.1
+debian/man/out/kopete.1

Modified: branches/kde-3.4.0/packages/kdenetwork/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/rules	2005-03-05 01:09:08 UTC (rev 661)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/rules	2005-03-05 01:32:53 UTC (rev 662)
@@ -12,4 +12,12 @@
 # DEB_DH_MAKESHLIBS_ARGS_kdelibs4 := -V'kdelibs4 (>= $(shlibs_ver))'
 
 DEB_SHLIBDEPS_INCLUDE := \
-	debian/librss1/usr/lib/
+	debian/librss1/usr/lib/ \
+	debian/kopete/usr/lib/
+
+DEB_DH_SHLIBDEPS_ARGS += $(DEB_DH_SHLIBDEPS_ARGS_$(cdbs_curpkg))
+DEB_DH_SHLIBDEPS_ARGS_kopete := \
+	-Xusr/lib/kde3/kopete_nowlistening.so \
+	-dSuggests \
+	debian/kopete/usr/lib/kde3/kopete_nowlistening.so \
+	-dDepends