r9649 - in /packages/unstable/pidgin/trunk/debian: changelog control
patches/20_purple-remote_friendly.patch patches/21_fi.po.patch
pidgin-dbg.postinst pidgin.install pidgin.postinst rules
ari at users.alioth.debian.org
ari at users.alioth.debian.org
Tue Apr 10 04:41:04 UTC 2007
Author: ari
Date: Tue Apr 10 04:41:03 2007
New Revision: 9649
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9649
Log:
More tweaks - package now builds, and gaim transitional packages may work
Added:
packages/unstable/pidgin/trunk/debian/patches/21_fi.po.patch
Removed:
packages/unstable/pidgin/trunk/debian/pidgin-dbg.postinst
packages/unstable/pidgin/trunk/debian/pidgin.postinst
Modified:
packages/unstable/pidgin/trunk/debian/changelog
packages/unstable/pidgin/trunk/debian/control
packages/unstable/pidgin/trunk/debian/patches/20_purple-remote_friendly.patch
packages/unstable/pidgin/trunk/debian/pidgin.install
packages/unstable/pidgin/trunk/debian/rules
Modified: packages/unstable/pidgin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/changelog?rev=9649&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/changelog (original)
+++ packages/unstable/pidgin/trunk/debian/changelog Tue Apr 10 04:41:03 2007
@@ -1,7 +1,7 @@
-pidgin (2.0.0~beta6+mtn20070409-1) UNRELEASED-experimental; urgency=low
+pidgin (1:2.0.0+beta6+mtn20070409-1) UNRELEASED-experimental; urgency=low
* New upstream snapshot - revision 90db723530550aafe25feb6c1352e02ee9907cd0
- * Change name of package to pidgin
+ * Change name of package to pidgin (Closes: #418215)
* Remove some leftover dependencies from etch
* 20_purple-remote_friendly.patch:
- Make error messages friendlier when python-dbus is not installed
Modified: packages/unstable/pidgin/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/control?rev=9649&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/control (original)
+++ packages/unstable/pidgin/trunk/debian/control Tue Apr 10 04:41:03 2007
@@ -18,6 +18,7 @@
Package: pidgin
Architecture: any
Depends: pidgin-data (>= ${source:Upstream-Version}), pidgin-data (<< ${source:Upstream-Version}-z) (${shlibs:Depends}, libsasl2-modules
+Replaces: pidgin (<< 1:2.0.0+beta6+mtn20070409-1)
Recommends: gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, python-dbus
Suggests: gnome-panel (>= 2.1) | kicker (>= 3.1) | docker, evolution-data-server (>= 1.6.0), ${shlibs:Suggests}
Conflicts: gaim-encryption (<= 3.0~beta7-1), gaim-librvp (<= 0.9.5-2), nautilus-sendto (<= 0.8-2)
@@ -52,6 +53,7 @@
Package: pidgin-data
Architecture: all
Depends: ${misc:Depends}
+Replaces: gaim-data (<< 1:2.0.0+beta6+mtn20070409-1)
Recommends: pidgin
Enhances: pidgin
Description: multi-protocol instant messaging client - data files
Modified: packages/unstable/pidgin/trunk/debian/patches/20_purple-remote_friendly.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/patches/20_purple-remote_friendly.patch?rev=9649&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/patches/20_purple-remote_friendly.patch (original)
+++ packages/unstable/pidgin/trunk/debian/patches/20_purple-remote_friendly.patch Tue Apr 10 04:41:03 2007
@@ -1,6 +1,6 @@
-diff -Nur pidgin-2.0.0+beta6/libpurple/purple-remote pidgin-2.0.0+beta6.new/libpurple/purple-remote
---- pidgin-2.0.0+beta6/libpurple/purple-remote 2007-01-18 23:28:24.000000000 -0500
-+++ pidgin-2.0.0+beta6.new/libpurple/purple-remote 2007-03-19 22:47:49.000000000 -0400
+diff -Nur pidgin-2.0.0~beta6+mtn20070409/libpurple/purple-remote pidgin-2.0.0~beta6+mtn20070409.new/libpurple/purple-remote
+--- pidgin-2.0.0~beta6+mtn20070409/libpurple/purple-remote 2007-04-09 22:20:12.000000000 -0400
++++ pidgin-2.0.0~beta6+mtn20070409.new/libpurple/purple-remote 2007-04-09 22:21:12.000000000 -0400
@@ -1,6 +1,10 @@
#!/usr/bin/python
@@ -13,26 +13,26 @@
import re
import urllib
import sys
-@@ -172,7 +176,7 @@
+@@ -61,6 +65,7 @@
+ GaimAccountsFindConnected?name=&protocol=prpl-jabber
+ GaimAccountFindConnected(,prpl-jabber)
+ """ % sys.argv[0]
++ sys.exit(1)
+
+ cgaim = CheckedObject(gaim)
+
+@@ -204,7 +209,7 @@
+ show_help()
raise "Unknown command: %s" % command
-
-if len(sys.argv) == 1:
+if len(sys.argv) == 1 or sys.argv[1] == "--help" or sys.argv == "-h":
- print """This program uses DBus to communicate with pidgin.
-
- Usage:
-@@ -203,6 +207,7 @@
- pidginAccountsFindConnected?name=&protocol=prpl-jabber
- pidginAccountFindConnected(,prpl-jabber)
- """ % sys.argv[0]
-+ sys.exit(1)
+ show_help()
for arg in sys.argv[1:]:
- output = execute(arg)
-diff -Nur pidgin-2.0.0+beta6/libpurple/purple-url-handler pidgin-2.0.0+beta6.new/libpurple/purple-url-handler
---- pidgin-2.0.0+beta6/libpurple/purple-url-handler 2007-01-18 23:28:24.000000000 -0500
-+++ pidgin-2.0.0+beta6.new/libpurple/purple-url-handler 2007-03-19 22:48:34.000000000 -0400
+diff -Nur pidgin-2.0.0~beta6+mtn20070409/libpurple/purple-url-handler pidgin-2.0.0~beta6+mtn20070409.new/libpurple/purple-url-handler
+--- pidgin-2.0.0~beta6+mtn20070409/libpurple/purple-url-handler 2007-04-09 22:16:28.000000000 -0400
++++ pidgin-2.0.0~beta6+mtn20070409.new/libpurple/purple-url-handler 2007-04-09 22:20:36.000000000 -0400
@@ -1,6 +1,10 @@
#!/usr/bin/python
Added: packages/unstable/pidgin/trunk/debian/patches/21_fi.po.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/patches/21_fi.po.patch?rev=9649&op=file
==============================================================================
--- packages/unstable/pidgin/trunk/debian/patches/21_fi.po.patch (added)
+++ packages/unstable/pidgin/trunk/debian/patches/21_fi.po.patch Tue Apr 10 04:41:03 2007
@@ -1,0 +1,12 @@
+--- pidgin-2.0.0+beta6.orig/po/fi.po 962d9a9ae6f4e6db3979a66bb13d4f528137474a
++++ pidgin-2.0.0+beta6/po/fi.po 5fc7316239b23d1e1749a7848e3cda7a2a74442d
+@@ -15499,9 +15499,6 @@ msgstr ""
+ #~ msgid "Provides options specific to Windows "
+ #~ msgstr "Tarjoaa asetukset jotka liittyvät erityisesti Windows-versioon "
+
+-#~ msgid "Pidgin Internet Messenger"
+-#~ msgstr "Pidgin-pikaviestin"
+-
+ #~ msgid "/Conversation/Insert Lin_k..."
+ #~ msgstr "/Keskustelu/Lisää lin_kki..."
+
Modified: packages/unstable/pidgin/trunk/debian/pidgin.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/pidgin.install?rev=9649&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/pidgin.install (original)
+++ packages/unstable/pidgin/trunk/debian/pidgin.install Tue Apr 10 04:41:03 2007
@@ -5,6 +5,7 @@
debian/tmp/usr/bin/purple-send-async
debian/tmp/usr/bin/purple-url-handler
debian/tmp/usr/lib/*.so.*
+debian/tmp/usr/lib/gaim/*.so*
debian/tmp/usr/lib/finch/*.so*
debian/tmp/usr/lib/libpurple/*.so*
debian/tmp/usr/lib/libpurple/private/*.so*
Modified: packages/unstable/pidgin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/rules?rev=9649&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/rules (original)
+++ packages/unstable/pidgin/trunk/debian/rules Tue Apr 10 04:41:03 2007
@@ -4,6 +4,7 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/utils.mk
# Build into a separate directory
DEB_BUILDDIR = $(DEB_SRCDIR)/build
@@ -13,7 +14,7 @@
LDFLAGS = -Wl,--as-needed
DEB_CONFIGURE_EXTRA_FLAGS := --enable-perl --disable-silc --with-zephyr=/usr --enable-dbus --enable-gnutls=no --enable-nss=yes --enable-cyrus-sasl
-DEB_DH_MAKESHLIBS_ARGS_pidgin := -V X/usr/lib/finch -X/usr/lib/libpurple --X/usr/lib/pidgin
+DEB_DH_MAKESHLIBS_ARGS_pidgin := -V -X/usr/lib/finch -X/usr/lib/libpurple -X/usr/lib/pidgin
DEB_DH_SHLIBDEPS_ARGS_pidgin := -X/usr/lib/libpurple/libgg.so -X/usr/lib/libpurple/libzephyr.so -X/usr/lib/libpurple/tcl.so -X/usr/lib/libpurple/gevolution.so -X/usr/lib/libpurple/libsametime.so -- -dSuggests debian/pidgin/usr/lib/libpurple/libgg.so debian/pidgin/usr/lib/libpurple/libzephyr.so debian/pidgin/usr/lib/libpurple/tcl.so debian/pidgin/usr/lib/libpurple/libsametime.so -dDepends
# documentation is in the pidgin-data package
@@ -32,25 +33,27 @@
DEB_INSTALL_CHANGELOGS_pidgin-dbg := --no-act
DEB_INSTALL_DOCS_pidgin-dbg := --no-act
-## Compatibility stuff for old gaim packages
-#DEB_DH_LINK_gaim := usr/share/doc/gaim-data usr/share/doc/gaim
-#DEB_INSTALL_CHANGELOGS_gaim := --no-act
-#DEB_INSTALL_DOCS_gaim := --no-act
-#
-#DEB_DH_LINK_gaim-dbg := usr/share/doc/gaim-data usr/share/doc/gaim-dbg
-#DEB_INSTALL_CHANGELOGS_gaim-dbg := --no-act
-#DEB_INSTALL_DOCS_gaim-dbg := --no-act
-#
-#DEB_DH_LINK_gaim-dev := usr/share/doc/gaim-data usr/share/doc/gaim-dev
-#DEB_INSTALL_CHANGELOGS_gaim-dev := --no-act
-#DEB_INSTALL_DOCS_gaim-dev := --no-act
+## Compatibility symlinks for old gaim packages
+DEB_DH_LINK_gaim := usr/share/doc/gaim-data usr/share/doc/gaim
+DEB_INSTALL_CHANGELOGS_gaim := --no-act
+DEB_INSTALL_DOCS_gaim := --no-act
+
+DEB_DH_LINK_gaim-dbg := usr/share/doc/gaim-data usr/share/doc/gaim-dbg
+DEB_INSTALL_CHANGELOGS_gaim-dbg := --no-act
+DEB_INSTALL_DOCS_gaim-dbg := --no-act
+
+DEB_DH_LINK_gaim-dev := usr/share/doc/gaim-data usr/share/doc/gaim-dev
+DEB_INSTALL_CHANGELOGS_gaim-dev := --no-act
+DEB_INSTALL_DOCS_gaim-dev := --no-act
cleanbuilddir/pidgin::
rm -rf $(DEB_SRCDIR)/build
-binary-install/pidgin::
- rm debian/pidgin/usr/lib/pidgin/relnot.so # Remove release notification plugin
+common-install-impl::
+ rm -f debian/tmp/usr/lib/pidgin/relnot.so # release notification plugin
+ rm -f debian/tmp/usr/bin/{nullclient,purple-client-example} # examples
+ find debian/tmp/usr/lib -name '*.la' -print0 | xargs -0 rm
build/pidgin-dev::
pod2man debian/dh_pidgin > debian/dh_pidgin.1
@@ -66,3 +69,4 @@
cleanbuilddir/pidgin-dev::
rm -f debian/dh_pidgin.1
+
More information about the pkg-gnome-commits
mailing list