[Pkg-cli-apps-commits] r4750 - in /packages/gnome-do-plugins/trunk/debian: changelog control copyright patches/00_dfsg_autofoo.dpatch patches/00list patches/02_ssh_respect_exec_arg.dpatch patches/03_buildsystem_respect_mcs.dpatch patches/04_fix_pidgin_dbus_ints.dpatch rules

laney-guest at users.alioth.debian.org laney-guest at users.alioth.debian.org
Sun Mar 22 01:45:45 UTC 2009


Author: laney-guest
Date: Sun Mar 22 01:45:45 2009
New Revision: 4750

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4750
Log:
* New upstream release (LP: #344578)
  + Banshee plugin goes crazy if banshee isn't loaded first
    (LP: #289802)
  + gnome-do gCalculate plugin fails to display "times" symbol
    (LP: #274252)
  + Banshee-1 fails to build in Mono 2.0 (LP: #309188)
  + Pidgin 2.5.4 has incompatible dbus interface. s/uint/int/
    (LP: #314927)
  + Pidgin plugin hangs opening a chat if pidgin is unresponsive
    (LP: #315565)
  + twitter plugin still reports friend updates even when
    deactivated (LP: #317674)
  + Misspelling in microblogging plugin confirmation message
    (LP: #319433)
  + make install uses mdtool, but configure doesn't check for it
    (LP: #322951)
  + Virtualbox Icon in 2.10 are broken because of a new
    specification (LP: #323902)
  + Google Maps Plugin shouldn't always use route (LP: #324271)
  + Fix for Google Maps when using newlines and other special
    characters (LP: #324667)
  + VirtualBox failed to load icon (LP: #325712)
  + 'Read Man Pages' plugin makes Gnome-Do unresponsive
    (LP: #325935)
  + Search returns broken URLs (LP: #327855)
  + Default action for SSH hosts is "open" (LP: #328236)
  + Files and Folders Configuration doesn't use standard buttons
    (LP: #328236)
  + Window manager maximize action should focus if window is not
    currently focused (LP: #258893)
  + Locate plugin has no error message (LP: #262360)
  + Wishlist: Let user specify files and folders to ignore
    (LP: #263177)
  + ts-client plugin doesn't index subdirectories (LP: #322352)
  + Max 3000 items in Files and Folders plugin (LP: #324105)
  + putty cannot find host when running from gnome do
    (LP: #324282)
  + locate plugin with globbing (LP: #334798)
  + Twitter plugin encountered an error in UpdateFriends
    (LP: #317575)
  + gnome-terminal profiles no longer work (LP: #321977)
  + Creating a task using Remember the Milk plugin can fail if
    no task list is specified (LP: #324066)
  + bundled libraries makefile needs destdir (LP: #324704)
  + Typographical error in del.icio.us plugin (LP: #330525)
  + ImageShack fails to upload (LP: #337324)
* debian/copyright
  + Refresh for new upstream version; new plugins added.
* debian/patches/00_dfsg_autofoo.dpatch
  + Update for new upstream version
  + Don't build the YouTube plugin due to removal of shipped
    exes and dlls causing FTBFS
* debian/patches/02_ssh_respect_exec_arg.dpatch
  debian/patches/03_buildsystem_respect_mcs.dpatch
  + Drop; fixed upstream
* debian/patches/04_fix_pidgin_dbus_ints.dpatch: Add left out piece of patch
  (Closes: #517175)
* debian/control: Bump gnome-do build-dep to require current version. 
* debian/patches/10_rhtyhmbox_file.patch: Backport upstream patch to fix RB
  plugin 
* debian/copyright: Update for gdata in BundledLibs (these plugins are not
  built)
* debian/rules: Update repacking to account for upstream BundledLibs change

Added:
    packages/gnome-do-plugins/trunk/debian/patches/04_fix_pidgin_dbus_ints.dpatch   (with props)
Removed:
    packages/gnome-do-plugins/trunk/debian/patches/02_ssh_respect_exec_arg.dpatch
    packages/gnome-do-plugins/trunk/debian/patches/03_buildsystem_respect_mcs.dpatch
Modified:
    packages/gnome-do-plugins/trunk/debian/changelog
    packages/gnome-do-plugins/trunk/debian/control
    packages/gnome-do-plugins/trunk/debian/copyright
    packages/gnome-do-plugins/trunk/debian/patches/00_dfsg_autofoo.dpatch
    packages/gnome-do-plugins/trunk/debian/patches/00list
    packages/gnome-do-plugins/trunk/debian/rules

Modified: packages/gnome-do-plugins/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/changelog?rev=4750&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/changelog (original)
+++ packages/gnome-do-plugins/trunk/debian/changelog Sun Mar 22 01:45:45 2009
@@ -1,3 +1,74 @@
+gnome-do-plugins (0.8.1.3+dfsg-1) UNRELEASED; urgency=low
+
+  [ Daniel T Chen ]
+  * New upstream release (LP: #344578)
+    + Banshee plugin goes crazy if banshee isn't loaded first
+      (LP: #289802)
+    + gnome-do gCalculate plugin fails to display "times" symbol
+      (LP: #274252)
+    + Banshee-1 fails to build in Mono 2.0 (LP: #309188)
+    + Pidgin 2.5.4 has incompatible dbus interface. s/uint/int/
+      (LP: #314927)
+    + Pidgin plugin hangs opening a chat if pidgin is unresponsive
+      (LP: #315565)
+    + twitter plugin still reports friend updates even when
+      deactivated (LP: #317674)
+    + Misspelling in microblogging plugin confirmation message
+      (LP: #319433)
+    + make install uses mdtool, but configure doesn't check for it
+      (LP: #322951)
+    + Virtualbox Icon in 2.10 are broken because of a new
+      specification (LP: #323902)
+    + Google Maps Plugin shouldn't always use route (LP: #324271)
+    + Fix for Google Maps when using newlines and other special
+      characters (LP: #324667)
+    + VirtualBox failed to load icon (LP: #325712)
+    + 'Read Man Pages' plugin makes Gnome-Do unresponsive
+      (LP: #325935)
+    + Search returns broken URLs (LP: #327855)
+    + Default action for SSH hosts is "open" (LP: #328236)
+    + Files and Folders Configuration doesn't use standard buttons
+      (LP: #328236)
+    + Window manager maximize action should focus if window is not
+      currently focused (LP: #258893)
+    + Locate plugin has no error message (LP: #262360)
+    + Wishlist: Let user specify files and folders to ignore
+      (LP: #263177)
+    + ts-client plugin doesn't index subdirectories (LP: #322352)
+    + Max 3000 items in Files and Folders plugin (LP: #324105)
+    + putty cannot find host when running from gnome do
+      (LP: #324282)
+    + locate plugin with globbing (LP: #334798)
+    + Twitter plugin encountered an error in UpdateFriends
+      (LP: #317575)
+    + gnome-terminal profiles no longer work (LP: #321977)
+    + Creating a task using Remember the Milk plugin can fail if
+      no task list is specified (LP: #324066)
+    + bundled libraries makefile needs destdir (LP: #324704)
+    + Typographical error in del.icio.us plugin (LP: #330525)
+    + ImageShack fails to upload (LP: #337324)
+  * debian/copyright
+    + Refresh for new upstream version; new plugins added.
+  * debian/patches/00_dfsg_autofoo.dpatch
+    + Update for new upstream version
+    + Don't build the YouTube plugin due to removal of shipped
+      exes and dlls causing FTBFS
+  * debian/patches/02_ssh_respect_exec_arg.dpatch
+    debian/patches/03_buildsystem_respect_mcs.dpatch
+    + Drop; fixed upstream
+
+  [ Iain Lane ]
+  * debian/patches/04_fix_pidgin_dbus_ints.dpatch: Add left out piece of patch
+    (Closes: #517175)
+  * debian/control: Bump gnome-do build-dep to require current version. 
+  * debian/patches/10_rhtyhmbox_file.patch: Backport upstream patch to fix RB
+    plugin 
+  * debian/copyright: Update for gdata in BundledLibs (these plugins are not
+    built)
+  * debian/rules: Update repacking to account for upstream BundledLibs change
+
+ -- Iain Lane <laney at ubuntu.com>  Sun, 22 Mar 2009 01:45:20 +0000
+
 gnome-do-plugins (0.8.0.2+dfsg1-1) unstable; urgency=low
 
   [ Christopher James Halse Rogers ]

Modified: packages/gnome-do-plugins/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/control?rev=4750&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/control (original)
+++ packages/gnome-do-plugins/trunk/debian/control Sun Mar 22 01:45:45 2009
@@ -24,7 +24,7 @@
   libgnome-keyring1.0-cil,
   libgnomedesktop2.20-cil,
   libgconf2.0-cil,
-  libgnome2.0-cil,
+  libgnome2.24-cil,
   libgnome-vfs2.0-cil,
   libmono-addins0.2-cil,
   libmono-addins-gui0.2-cil,

Modified: packages/gnome-do-plugins/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/copyright?rev=4750&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/copyright (original)
+++ packages/gnome-do-plugins/trunk/debian/copyright Sun Mar 22 01:45:45 2009
@@ -5,7 +5,7 @@
 
 X-Repacked-Comment:
     The upstream source has been repacked to remove the shipped binary
-    libraries Google Data and MonoTorrent.  See README.Source for details.
+    compiler gmcs.exe.  See README.Source for details.
 
 Files: debian/*
 Copyright: © 2008 Christopher James Halse Rogers <raof at ubuntu.com>, 
@@ -43,6 +43,10 @@
 
 File: Pidgin/src/Pidgin{Account,StatusType}Item.cs
 Copyright: © 2008 Alex Launi
+License: GPL-3+
+
+Files: RequestTracker/src/*.cs
+Copyright: © 2009 Chris Jones <cmsj at tenshu.net>
 License: GPL-3+
 
 Files: Riptide/src/*.cs
@@ -113,6 +117,10 @@
 Copyright: © 2008 jmargolese  <jmargolese at gmail.com>
 License: GPL-3+
 
+Files: YouTube/src/*.cs
+Copyright: © 2009 Luis Miguel Montiel <luismmontielg at gmail.com>
+License: GPL-3+
+
 Files: WindowManager/src/*.cs
 Copyright: © 2007 David Siegel,
 	   © 2007 Elliot Murphy,
@@ -121,6 +129,32 @@
 	   © 2007 Christopher Edwards,
 	   © 2007 Kenneth Simon
 License: GPL-2+
+
+Files: BundledLibraries/libgoogle-data-mono-1.4.0.2/*.cs
+Copyright: © 2006-2008 Google, Inc.
+License: Apache-2
+
+Files: BundledLibraries/libgoogle-data-mono-1.4.0.2/src/core/HttpUtility.cs
+Copyright: © 2005 Novell, Inc
+License:
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+    
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+    
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 License: GPL-3+
     This program is free software: you can redistribute it and/or modify
@@ -155,3 +189,16 @@
 
     On Debian systems, the complete text of the GNU General Public License
     can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: Apache-2
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+         /usr/share/common-licenses/Apache-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.

Modified: packages/gnome-do-plugins/trunk/debian/patches/00_dfsg_autofoo.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/patches/00_dfsg_autofoo.dpatch?rev=4750&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/00_dfsg_autofoo.dpatch (original)
+++ packages/gnome-do-plugins/trunk/debian/patches/00_dfsg_autofoo.dpatch Sun Mar 22 01:45:45 2009
@@ -1,16 +1,16 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 00_dfsg_autofoo.dpatch by Christopher James Halse Rogers <raof at ubuntu.com>
+## 00_dfsg_autofoo.dpatch by Iain Lane <laney at ubuntu.com>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't build plugins that depend on the binary DLLs that we strip from
-## DP: the tarball.
+## DP: Don't build plugins that depend on the bundled libs in the tarball.
 
 @DPATCH@
-diff -urNad gnome-do-plugins-0.8.0.2+dfsg~/BundledLibraries/Makefile.am gnome-do-plugins-0.8.0.2+dfsg/BundledLibraries/Makefile.am
---- gnome-do-plugins-0.8.0.2+dfsg~/BundledLibraries/Makefile.am	2009-02-05 11:11:42.000000000 +1100
-+++ gnome-do-plugins-0.8.0.2+dfsg/BundledLibraries/Makefile.am	2009-02-17 11:09:34.002731510 +1100
-@@ -1,18 +1,12 @@
- bundledir = ${datadir}/gnome-do/plugins
+diff -urNad gnome-do-plugins-0.8.1.3+dfsg~/BundledLibraries/Makefile.am gnome-do-plugins-0.8.1.3+dfsg/BundledLibraries/Makefile.am
+--- gnome-do-plugins-0.8.1.3+dfsg~/BundledLibraries/Makefile.am	2009-03-22 01:25:31.000000000 +0000
++++ gnome-do-plugins-0.8.1.3+dfsg/BundledLibraries/Makefile.am	2009-03-22 01:26:31.000000000 +0000
+@@ -3,14 +3,7 @@
+ gdata_subdir = libgoogle-data-mono-1.4.0.2
+ gdata_subdir_full = $(addprefix $(srcdir)/,$(gdata_subdir))
  
 -GOOGLE_LIBS = \
 -	Google.GData.AccessControl.dll \
@@ -18,57 +18,75 @@
 -	Google.GData.Client.dll \
 -	Google.GData.Contacts.dll \
 -	Google.GData.Documents.dll \
--	Google.GData.Extensions.dll 
-+GOOGLE_LIBS =
+-	Google.GData.YouTube.dll \
+-	Google.GData.Extensions.dll
++GOOGLE_LIBS = 
  
  bundle_DATA = \
  	$(addprefix $(srcdir)/,$(GOOGLE_LIBS)) \
- 	$(BANSHEE_INDEXER_DLL)
- 
--EXTRA_DIST=$(GOOGLE_LIBS) gmcs.exe
-+EXTRA_DIST=$(GOOGLE_LIBS)
- 
- # Copy these to the build dir; some things require the dlls to be present
- # during build - particularly mautil.
-diff -urNad gnome-do-plugins-0.8.0.2+dfsg~/Makefile.am gnome-do-plugins-0.8.0.2+dfsg/Makefile.am
---- gnome-do-plugins-0.8.0.2+dfsg~/Makefile.am	2009-02-05 11:10:20.000000000 +1100
-+++ gnome-do-plugins-0.8.0.2+dfsg/Makefile.am	2009-02-17 11:08:37.061584246 +1100
+diff -urNad gnome-do-plugins-0.8.1.3+dfsg~/Makefile.am gnome-do-plugins-0.8.1.3+dfsg/Makefile.am
+--- gnome-do-plugins-0.8.1.3+dfsg~/Makefile.am	2009-03-22 01:25:31.000000000 +0000
++++ gnome-do-plugins-0.8.1.3+dfsg/Makefile.am	2009-03-22 01:27:06.000000000 +0000
 @@ -25,9 +25,6 @@
+ 	GNOME-Screenshot \
  	GNOME-Session \
  	GNOME-Terminal \
- 	GoogleCalculator \
--	GoogleCalendar \
--	GoogleContacts \
--	GoogleDocs \
- 	GoogleMaps \
- 	GoogleSearch \
+-	GoogleCalculator \
+-	GoogleMaps \
+-	GoogleSearch \
  	ImageShack \
-@@ -47,7 +44,6 @@
- 	Quote \
- 	RememberTheMilk \
- 	Rhythmbox \
--	Riptide \
- 	RSS \
- 	Shelf \
- 	Skype \
-diff -urNad gnome-do-plugins-0.8.0.2+dfsg~/configure.ac gnome-do-plugins-0.8.0.2+dfsg/configure.ac
---- gnome-do-plugins-0.8.0.2+dfsg~/configure.ac	2009-02-05 11:35:53.000000000 +1100
-+++ gnome-do-plugins-0.8.0.2+dfsg/configure.ac	2009-02-17 11:08:37.061584246 +1100
-@@ -140,9 +140,6 @@
+ 	JIRA \
+ 	Launchpad \
+@@ -68,7 +65,6 @@
+ 	Woof \
+ 	Wordnet \
+ 	Xmms2 \
+-	YouTube \
+ 	Zim 
+ 
+ # Current dir _must_ be processed last; this ensures our repo is built with all
+diff -urNad gnome-do-plugins-0.8.1.3+dfsg~/configure.ac gnome-do-plugins-0.8.1.3+dfsg/configure.ac
+--- gnome-do-plugins-0.8.1.3+dfsg~/configure.ac	2009-03-22 01:25:31.000000000 +0000
++++ gnome-do-plugins-0.8.1.3+dfsg/configure.ac	2009-03-22 01:27:59.000000000 +0000
+@@ -56,12 +56,6 @@
+ PKG_CHECK_MODULES([NOTIFY_SHARP], [notify-sharp])
+ PKG_CHECK_MODULES([WNCK_SHARP_10], [wnck-sharp-1.0])
+ 
+-dnl Handle bundled Google libs until they're packaged
+-GDATA_SHARP_ACL_LIBS=-r:$top_srcdir/BundledLibraries/Google.GData.AccessControl.dll
+-GDATA_SHARP_CALENDAR_LIBS="-r:$top_srcdir/BundledLibraries/Google.GData.Client.dll -r:$top_srcdir/BundledLibraries/Google.GData.Extensions.dll -r:$top_srcdir/BundledLibraries/Google.GData.Calendar.dll"
+-GDATA_SHARP_DOCUMENTS_LIBS="-r:$top_srcdir/BundledLibraries/Google.GData.Client.dll -r:$top_srcdir/BundledLibraries/Google.GData.Extensions.dll -r:$top_srcdir/BundledLibraries/Google.GData.Documents.dll"
+-GDATA_SHARP_CONTACTS_LIBS="-r:$top_srcdir/BundledLibraries/Google.GData.Client.dll -r:$top_srcdir/BundledLibraries/Google.GData.Extensions.dll -r:$top_srcdir/BundledLibraries/Google.GData.Contacts.dll"
+-
+ dnl We need to copy Banshee.CollectionIndexer.dll; it's not in the GAC
+ BANSHEE_INDEXER_DLL=$($PKG_CONFIG --variable=Libraries banshee-1-collection-indexer)
+ 
+@@ -69,10 +63,6 @@
+ AC_SUBST([EVOLUTION_SHARP_LIBS])
+ AC_SUBST([FLICKRNET_LIBS])
+ AC_SUBST([GCONF_SHARP_20_LIBS])
+-AC_SUBST([GDATA_SHARP_ACL_LIBS])
+-AC_SUBST([GDATA_SHARP_CALENDAR_LIBS])
+-AC_SUBST([GDATA_SHARP_CONTACTS_LIBS])
+-AC_SUBST([GDATA_SHARP_DOCUMENTS_LIBS])
+ AC_SUBST([GLADE_SHARP_20_LIBS])
+ AC_SUBST([GLIB_SHARP_20_LIBS])
+ AC_SUBST([GNOME_DESKTOP_SHARP_20_LIBS])
+@@ -140,9 +130,6 @@
+ GNOME-Screenshot/Makefile
  GNOME-Session/Makefile
  GNOME-Terminal/Makefile
- GoogleCalculator/Makefile
--GoogleCalendar/Makefile
--GoogleContacts/Makefile
--GoogleDocs/Makefile
- GoogleMaps/Makefile
- GoogleSearch/Makefile
+-GoogleCalculator/Makefile
+-GoogleMaps/Makefile
+-GoogleSearch/Makefile
  ImageShack/Makefile
-@@ -162,7 +159,6 @@
- Quote/Makefile
- RememberTheMilk/Makefile
- Rhythmbox/Makefile
--Riptide/Makefile
- RSS/Makefile
- Shelf/Makefile
- Skype/Makefile
+ JIRA/Makefile
+ Launchpad/Makefile
+@@ -183,7 +170,6 @@
+ Woof/Makefile
+ Wordnet/Makefile
+ Xmms2/Makefile
+-YouTube/Makefile
+ Zim/Makefile
+ Makefile
+ po/Makefile.in

Modified: packages/gnome-do-plugins/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/patches/00list?rev=4750&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/00list (original)
+++ packages/gnome-do-plugins/trunk/debian/patches/00list Sun Mar 22 01:45:45 2009
@@ -1,3 +1,1 @@
-00_dfsg_autofoo
-01_firefox_iceweasel_rename
-02_ssh_respect_exec_arg
+04_fix_pidgin_dbus_ints

Added: packages/gnome-do-plugins/trunk/debian/patches/04_fix_pidgin_dbus_ints.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/patches/04_fix_pidgin_dbus_ints.dpatch?rev=4750&op=file
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/04_fix_pidgin_dbus_ints.dpatch (added)
+++ packages/gnome-do-plugins/trunk/debian/patches/04_fix_pidgin_dbus_ints.dpatch Sun Mar 22 01:45:45 2009
@@ -1,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_fix_pidgin_dbus_ints.dpatch by Iain Lane <laney at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gnome-do-plugins-0.8.1.3+dfsg~/Pidgin/src/PidginAccountActions.cs gnome-do-plugins-0.8.1.3+dfsg/Pidgin/src/PidginAccountActions.cs
+--- gnome-do-plugins-0.8.1.3+dfsg~/Pidgin/src/PidginAccountActions.cs	2009-03-17 17:56:56.000000000 +0000
++++ gnome-do-plugins-0.8.1.3+dfsg/Pidgin/src/PidginAccountActions.cs	2009-03-17 20:04:22.000000000 +0000
+@@ -114,7 +114,12 @@
+ 
+ 			try {
+ 				prpl = Pidgin.GetPurpleObject ();
+-				prpl.PurpleAccountSetEnabled (account.Id, "gtk-gaim", 0);
++				try {
++					prpl.PurpleAccountSetEnabled (account.Id, "gtk-gaim", (int) 0);
++				}
++				catch {
++					prpl.PurpleAccountSetEnabled (account.Id, "gtk-gaim", (uint) 0);
++				}
+ 			} catch (Exception e) {
+ 				Log<PidginDisableAccount>.Error ("Could not disable Pidgin account: {0}", e.Message);
+ 				Log<PidginDisableAccount>.Debug (e.StackTrace);

Propchange: packages/gnome-do-plugins/trunk/debian/patches/04_fix_pidgin_dbus_ints.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/gnome-do-plugins/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/rules?rev=4750&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/rules (original)
+++ packages/gnome-do-plugins/trunk/debian/rules Sun Mar 22 01:45:45 2009
@@ -56,7 +56,6 @@
 	cd $(TEMP_DIR) && tar xzvf *.tar.gz
 
 strip-shipped-binaries: download-tarball
-	rm $(SOURCE_DIR)/BundledLibraries/*.dll
 	rm $(SOURCE_DIR)/BundledLibraries/*.exe
 
 repack-source: strip-shipped-binaries




More information about the Pkg-cli-apps-commits mailing list