[Pkg-cli-apps-commits] r4832 - in /packages/gnome-do-plugins/trunk/debian: changelog control copyright patches/00_dfsg_autofoo.dpatch rules

laney-guest at users.alioth.debian.org laney-guest at users.alioth.debian.org
Sat Apr 18 13:24:29 UTC 2009 

Author: laney-guest
Date: Sat Apr 18 13:24:29 2009
New Revision: 4832

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4832
Log:
Update dfsg and stuffs

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/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=4832&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/changelog (original)
+++ packages/gnome-do-plugins/trunk/debian/changelog Sat Apr 18 13:24:29 2009
@@ -63,11 +63,11 @@
   * 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
+  * debian/control: Add myself to Uploaders 
+  * debian/control: GNOME# transition (again)
 
- -- Iain Lane <laney at ubuntu.com>  Sun, 22 Mar 2009 01:45:20 +0000
+ -- Iain Lane <laney at ubuntu.com>  Sat, 18 Apr 2009 14:13:30 +0100
 
 gnome-do-plugins (0.8.0.2+dfsg1-1) unstable; urgency=low
 

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=4832&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/control (original)
+++ packages/gnome-do-plugins/trunk/debian/control Sat Apr 18 13:24:29 2009
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
-Uploaders: Christopher James Halse Rogers <raof at ubuntu.com>, Colin Turner <ct at piglets.com>
+Uploaders: Christopher James Halse Rogers <raof at ubuntu.com>, Colin Turner <ct at piglets.com>, Iain Lane <laney at ubuntu.com>
 Build-Depends: debhelper (>= 7), 
   cli-common-dev (>= 0.5.7),
   dpatch

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=4832&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/copyright (original)
+++ packages/gnome-do-plugins/trunk/debian/copyright Sat Apr 18 13:24:29 2009
@@ -5,7 +5,8 @@
 
 X-Repacked-Comment:
     The upstream source has been repacked to remove the shipped binary
-    compiler gmcs.exe.  See README.Source for details.
+    compiler gmcs.exe and the bundled copy of Google's gdata libs.
+	See README.Source for details.
 
 Files: debian/*
 Copyright: © 2008 Christopher James Halse Rogers <raof at ubuntu.com>, 
@@ -130,32 +131,6 @@
 	   © 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
     it under the terms of the GNU General Public License as published by
@@ -189,16 +164,3 @@
 
     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=4832&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 Sat Apr 18 13:24:29 2009
@@ -6,8 +6,8 @@
 
 @DPATCH@
 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
+--- gnome-do-plugins-0.8.1.3+dfsg~/BundledLibraries/Makefile.am	2009-03-17 18:53:30.000000000 +0000
++++ gnome-do-plugins-0.8.1.3+dfsg/BundledLibraries/Makefile.am	2009-04-18 13:59:50.000000000 +0100
 @@ -3,14 +3,7 @@
  gdata_subdir = libgoogle-data-mono-1.4.0.2
  gdata_subdir_full = $(addprefix $(srcdir)/,$(gdata_subdir))
@@ -25,19 +25,22 @@
  bundle_DATA = \
  	$(addprefix $(srcdir)/,$(GOOGLE_LIBS)) \
 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-do-plugins-0.8.1.3+dfsg~/Makefile.am	2009-03-17 17:56:56.000000000 +0000
++++ gnome-do-plugins-0.8.1.3+dfsg/Makefile.am	2009-04-18 14:02:36.000000000 +0100
+@@ -25,12 +25,6 @@
  	GNOME-Screenshot \
  	GNOME-Session \
  	GNOME-Terminal \
 -	GoogleCalculator \
+-	GoogleCalendar \
+-	GoogleContacts \
+-	GoogleDocs \
 -	GoogleMaps \
 -	GoogleSearch \
  	ImageShack \
  	JIRA \
  	Launchpad \
-@@ -68,7 +65,6 @@
+@@ -72,7 +66,6 @@
  	Woof \
  	Wordnet \
  	Xmms2 \
@@ -46,8 +49,8 @@
  
  # 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
+--- gnome-do-plugins-0.8.1.3+dfsg~/configure.ac	2009-03-17 18:54:14.000000000 +0000
++++ gnome-do-plugins-0.8.1.3+dfsg/configure.ac	2009-04-18 14:03:26.000000000 +0100
 @@ -56,12 +56,6 @@
  PKG_CHECK_MODULES([NOTIFY_SHARP], [notify-sharp])
  PKG_CHECK_MODULES([WNCK_SHARP_10], [wnck-sharp-1.0])
@@ -72,17 +75,20 @@
  AC_SUBST([GLADE_SHARP_20_LIBS])
  AC_SUBST([GLIB_SHARP_20_LIBS])
  AC_SUBST([GNOME_DESKTOP_SHARP_20_LIBS])
-@@ -140,9 +130,6 @@
+@@ -140,12 +130,6 @@
  GNOME-Screenshot/Makefile
  GNOME-Session/Makefile
  GNOME-Terminal/Makefile
 -GoogleCalculator/Makefile
+-GoogleCalendar/Makefile
+-GoogleContacts/Makefile
+-GoogleDocs/Makefile
 -GoogleMaps/Makefile
 -GoogleSearch/Makefile
  ImageShack/Makefile
  JIRA/Makefile
  Launchpad/Makefile
-@@ -183,7 +170,6 @@
+@@ -187,7 +171,6 @@
  Woof/Makefile
  Wordnet/Makefile
  Xmms2/Makefile

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=4832&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/rules (original)
+++ packages/gnome-do-plugins/trunk/debian/rules Sat Apr 18 13:24:29 2009
@@ -57,6 +57,7 @@
 
 strip-shipped-binaries: download-tarball
 	rm $(SOURCE_DIR)/BundledLibraries/*.exe
+	rm -r $(SOURCE_DIR)/BundledLibraries/libgoogle*
 
 repack-source: strip-shipped-binaries
 	cd $(TEMP_DIR) && \

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