r9647 - in /packages/unstable/pidgin/trunk/debian: ./ patches/

ari at users.alioth.debian.org ari at users.alioth.debian.org
Tue Apr 10 01:32:47 UTC 2007 

Author: ari
Date: Tue Apr 10 01:32:47 2007
New Revision: 9647

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9647
Log:
* New upstream snapshot - revision 90db723530550aafe25feb6c1352e02ee9907cd0
* First attempt at moving everything to pidgin based on latest development
snapshot


Added:
    packages/unstable/pidgin/trunk/debian/purple-remote.1
      - copied, changed from r9645, packages/unstable/pidgin/trunk/debian/pidgin-remote.1
Removed:
    packages/unstable/pidgin/trunk/debian/patches/02_gnthistory-in-gtk.patch
    packages/unstable/pidgin/trunk/debian/pidgin-remote.1
Modified:
    packages/unstable/pidgin/trunk/debian/changelog
    packages/unstable/pidgin/trunk/debian/control
    packages/unstable/pidgin/trunk/debian/copyright
    packages/unstable/pidgin/trunk/debian/pidgin-data.install
    packages/unstable/pidgin/trunk/debian/pidgin-data.manpages
    packages/unstable/pidgin/trunk/debian/pidgin-dev.install
    packages/unstable/pidgin/trunk/debian/pidgin-menu.xpm
    packages/unstable/pidgin/trunk/debian/pidgin.install
    packages/unstable/pidgin/trunk/debian/pidgin.menu
    packages/unstable/pidgin/trunk/debian/prefs.xml
    packages/unstable/pidgin/trunk/debian/rules
    packages/unstable/pidgin/trunk/debian/watch

Modified: packages/unstable/pidgin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/changelog?rev=9647&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/changelog (original)
+++ packages/unstable/pidgin/trunk/debian/changelog Tue Apr 10 01:32:47 2007
@@ -1,17 +1,15 @@
-gaim (1:2.0.0+beta6-3) UNRELEASED-experimental; urgency=low
+pidgin (2.0.0~beta6+mtn20070409-1) UNRELEASED-experimental; urgency=low
 
   * TODO: transitional package for gaim, maybe gaim-data and gaim-dev?
+  * New upstream snapshot - revision 90db723530550aafe25feb6c1352e02ee9907cd0
   * Change name of package to pidgin
   * Remove some leftover dependencies from etch
-  * 19_redirect_crash.patch:
-    - Add fix from upstream for a possible crash when performing a redirect
-      on an HTTP URL
-  * 20_gaim-remote_friendly.patch:
+  * 20_purple-remote_friendly.patch:
     - Make error messages friendlier when python-dbus is not installed
-      or if someone calls gaim-remote/gaim-url-handler with --help or -h
+      or if someone calls purple-remote/purple-url-handler with --help or -h
       (Closes: #413204)
-  * Loosen the dependency on gaim-data slightly (Closes: #403582)
-  * Add gaim-remote manpage from Anibal Avelar (Closes: #412278)
+  * Loosen the dependency on pidgin-data slightly (Closes: #403582)
+  * Add purple-remote manpage from Anibal Avelar (Closes: #412278)
 
  -- Ari Pollak <ari at debian.org>  Sun, 11 Mar 2007 04:25:29 -0400
 

Modified: packages/unstable/pidgin/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/control?rev=9647&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/control (original)
+++ packages/unstable/pidgin/trunk/debian/control Tue Apr 10 01:32:47 2007
@@ -1,4 +1,4 @@
-Source: gaim
+Source: pidgin
 Section: net
 Priority: optional
 Maintainer: Robert McQueen <robot101 at debian.org>
@@ -12,8 +12,8 @@
  libdbus-glib-1-dev, dbus, python (>= 2.4), libavahi-compat-howl-dev,
  libxml-parser-perl, libncursesw5-dev, libsasl2-dev, doxygen
 Standards-Version: 3.6.1
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/experimental/gaim
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gaim/
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/experimental/pidgin
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/pidgin
 
 Package: pidgin
 Architecture: any
@@ -27,7 +27,7 @@
  Groupwise, Sametime, and SIMPLE all at once.
  .
  Some extra packages are recommended to use the core functionality present
- in most gaim installations:
+ in most pidgin installations:
  * gstreamer0.10-plugins-base, gstreamer0.10-plugins-good
    - Sound support.
  * python-dbus
@@ -66,7 +66,7 @@
 Description: multi-protocol instant messaging client - development files
  This package contains the headers and other development files not included in
  the main pidgin package. Install this if you wish to compile your own plugins,
- or would like to compile programs that use the gaim-remote library.
+ or would like to compile programs that use the purple-remote library.
  .
  If you are creating a pidgin plugin package, please be sure to read
  /usr/share/doc/pidgin-dev/README.Debian.dev after installing pidgin-dev.

Modified: packages/unstable/pidgin/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/copyright?rev=9647&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/copyright (original)
+++ packages/unstable/pidgin/trunk/debian/copyright Tue Apr 10 01:32:47 2007
@@ -1,9 +1,8 @@
-gaim was initially packaged for Debian by Robert Edmonds <edmonds at debian.org>
-on Sat, 3 Jun 2000 11:22:17 -0400 and subsequently re-packaged
-by Robert McQueen <robot101 at debian.org> on Thu, 30 Aug 2001 19:23:30 +0100.
+pidgin was initially packaged for Debian by Ari Pollak <ari at debian.org>
+on Sun, Apr 8 2007.
 
 It was downloaded from:
- http://gaim.sourceforge.net/
+ http://www.pidgin.im
 
 The upstream authors are listed in the AUTHORS file, and an
 attempt at a more exhaustive list of copyright holders is

Modified: packages/unstable/pidgin/trunk/debian/pidgin-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/pidgin-data.install?rev=9647&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/pidgin-data.install (original)
+++ packages/unstable/pidgin/trunk/debian/pidgin-data.install Tue Apr 10 01:32:47 2007
@@ -4,4 +4,4 @@
 debian/tmp/usr/share/pixmaps
 debian/tmp/usr/share/sounds
 debian/pidgin-menu.xpm	usr/share/pixmaps
-debian/prefs.xml	etc/gaim
+debian/prefs.xml	etc/pidgin

Modified: packages/unstable/pidgin/trunk/debian/pidgin-data.manpages
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/pidgin-data.manpages?rev=9647&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/pidgin-data.manpages (original)
+++ packages/unstable/pidgin/trunk/debian/pidgin-data.manpages Tue Apr 10 01:32:47 2007
@@ -1,1 +1,1 @@
-debian/gaim-remote.1
+debian/purple-remote.1

Modified: packages/unstable/pidgin/trunk/debian/pidgin-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/pidgin-dev.install?rev=9647&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/pidgin-dev.install (original)
+++ packages/unstable/pidgin/trunk/debian/pidgin-dev.install Tue Apr 10 01:32:47 2007
@@ -2,4 +2,4 @@
 debian/tmp/usr/lib/*.so
 debian/tmp/usr/lib/pkgconfig
 debian/tmp/usr/share/aclocal
-debian/dh_gaim	usr/bin
+debian/dh_pidgin usr/bin

Modified: packages/unstable/pidgin/trunk/debian/pidgin-menu.xpm
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/pidgin-menu.xpm?rev=9647&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/pidgin-menu.xpm (original)
+++ packages/unstable/pidgin/trunk/debian/pidgin-menu.xpm Tue Apr 10 01:32:47 2007
@@ -1,5 +1,5 @@
 /* XPM */
-static char * gaim_menu_xpm[] = {
+static char * pidgin_menu_xpm[] = {
 "32 32 300 2",
 "  	c None",
 ". 	c #99861E",

Modified: packages/unstable/pidgin/trunk/debian/pidgin.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/pidgin.install?rev=9647&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/pidgin.install (original)
+++ packages/unstable/pidgin/trunk/debian/pidgin.install Tue Apr 10 01:32:47 2007
@@ -1,13 +1,14 @@
-debian/tmp/usr/bin/gaim
-debian/tmp/usr/bin/gaim-client-example
-debian/tmp/usr/bin/gaim-remote
-debian/tmp/usr/bin/gaim-send
-debian/tmp/usr/bin/gaim-send-async
-debian/tmp/usr/bin/gaim-text
-debian/tmp/usr/bin/gaim-url-handler
+debian/tmp/usr/bin/finch
+debian/tmp/usr/bin/pidgin
+debian/tmp/usr/bin/purple-remote
+debian/tmp/usr/bin/purple-send
+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/gaim/private/*.so*
+debian/tmp/usr/lib/finch/*.so*
+debian/tmp/usr/lib/libpurple/*.so*
+debian/tmp/usr/lib/libpurple/private/*.so*
 debian/tmp/usr/lib/perl5
+debian/tmp/usr/lib/pidgin/*.so*
 debian/tmp/usr/share/applications
 debian/tmp/usr/share/dbus-1

Modified: packages/unstable/pidgin/trunk/debian/pidgin.menu
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/pidgin.menu?rev=9647&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/pidgin.menu (original)
+++ packages/unstable/pidgin/trunk/debian/pidgin.menu Tue Apr 10 01:32:47 2007
@@ -1,4 +1,4 @@
 ?package(pidgin):needs="X11" section="Apps/Net" \
-  title="Gaim" command="/usr/bin/gaim" \
+  title="Pidgin" command="/usr/bin/pidgin" \
   longtitle="Multi-protocol Instant Messaging Client" \
   icon="/usr/share/pixmaps/pidgin-menu.xpm"

Modified: packages/unstable/pidgin/trunk/debian/prefs.xml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/prefs.xml?rev=9647&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/prefs.xml (original)
+++ packages/unstable/pidgin/trunk/debian/prefs.xml Tue Apr 10 01:32:47 2007
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <pref name='/'>
-	<pref name='gaim'>
+	<pref name='purple'>
 		<pref name='gtk'>
 			<pref name='browsers'>
 				<pref name='command' type='string' value='sensible-browser' />

Copied: packages/unstable/pidgin/trunk/debian/purple-remote.1 (from r9645, packages/unstable/pidgin/trunk/debian/pidgin-remote.1)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/purple-remote.1?rev=9647&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/pidgin-remote.1 (original)
+++ packages/unstable/pidgin/trunk/debian/purple-remote.1 Tue Apr 10 01:32:47 2007
@@ -1,9 +1,9 @@
-.TH GAIM-REMOTE 1
+.TH PURPLE-REMOTE 1
 .SH NAME
-gaim-remote \- Send remote commands to Gaim (need Dbus to communicate)
+purple-remote \- Send remote commands to Pidgin/Finch
 .SH SYNOPSIS
 .TP 5
-\fBgaim-remote \fIcommand1\fR \fIcommand2\fR \fI...\fR
+\fBpurple-remote \fIcommand1\fR \fIcommand2\fR \fI...\fR
 .RI 
 .br
 .SH OPTIONS
@@ -16,7 +16,7 @@
 FunctionName(value1,value2,...)
 .PP
 The second and third form are provided for completeness but their use
-is not recommended; use gaim-send or gaim-send-async instead.  The
+is not recommended; use purple-send or purple-send-async instead.  The
 second form uses introspection to find out the parameter names and
 their types, therefore it is rather slow.
 
@@ -34,13 +34,14 @@
 .br
 quit
 .PP
-GaimAccountsFindConnected?name=&protocol=prpl-jabber
+PidginAccountsFindConnected?name=&protocol=prpl-jabber
 .br
-GaimAccountFindConnected(,prpl-jabber)
+PidginAccountFindConnected(,prpl-jabber)
 
 .SH DESCRIPTION
 .PP
- Send remote commands to Gaim. This program uses DBus to communicate with gaim.
+Send remote commands to Gaim. This program uses DBus to communicate with
+Pidgin/Finch.
 
 .SH LICENSE
 .PP

Modified: packages/unstable/pidgin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/rules?rev=9647&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/rules (original)
+++ packages/unstable/pidgin/trunk/debian/rules Tue Apr 10 01:32:47 2007
@@ -13,8 +13,8 @@
 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/gaim
-DEB_DH_SHLIBDEPS_ARGS_pidgin := -X/usr/lib/gaim/libgg.so -X/usr/lib/gaim/libzephyr.so -X/usr/lib/gaim/tcl.so -X/usr/lib/gaim/gevolution.so -X/usr/lib/gaim/libsametime.so -- -dSuggests debian/pidgin/usr/lib/gaim/libgg.so debian/pidgin/usr/lib/gaim/libzephyr.so debian/pidgin/usr/lib/gaim/tcl.so debian/pidgin/usr/lib/gaim/libsametime.so -dDepends
+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
 DEB_DH_LINK_pidgin := usr/share/doc/pidgin-data usr/share/doc/pidgin
@@ -37,7 +37,7 @@
 	rm -rf $(DEB_SRCDIR)/build
 
 binary-install/pidgin::
-	rm debian/pidgin/usr/lib/gaim/relnot.so # Remove release notification plugin
+	rm debian/pidgin/usr/lib/pidgin/relnot.so # Remove release notification plugin
 
 build/pidgin-dev::
 	pod2man debian/dh_pidgin > debian/dh_pidgin.1

Modified: packages/unstable/pidgin/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/watch?rev=9647&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/watch (original)
+++ packages/unstable/pidgin/trunk/debian/watch Tue Apr 10 01:32:47 2007
@@ -1,3 +1,3 @@
 version=3
-opts="dversionmangle=s/\+(final)?//" \
-	  http://sf.net/gaim/gaim-(.*)\.tar\.gz
+#opts="dversionmangle=s/\+(final)?//" \
+#	  http://sf.net/gaim/gaim-(.*)\.tar\.gz

More information about the pkg-gnome-commits mailing list