[Python-modules-commits] r17051 - in packages/rabbitvcs/trunk/debian (4 files)

Thu May 19 14:02:18 UTC 2011

Date: Thursday, May 19, 2011 @ 14:01:54
  Author: jheeris-guest
Revision: 17051

Fixed up the setup.py patch, control file data and copyright info. Still some lintian complaints.

Modified:
  packages/rabbitvcs/trunk/debian/changelog
  packages/rabbitvcs/trunk/debian/control
  packages/rabbitvcs/trunk/debian/copyright
  packages/rabbitvcs/trunk/debian/patches/99_setup.py.patch

Modified: packages/rabbitvcs/trunk/debian/changelog
===================================================================

--- packages/rabbitvcs/trunk/debian/changelog	2011-05-19 10:58:58 UTC (rev 17050)
+++ packages/rabbitvcs/trunk/debian/changelog	2011-05-19 14:01:54 UTC (rev 17051)
@@ -1,3 +1,9 @@
+rabbitvcs (0.14.2.1-1) UNRELEASED; urgency=low
+
+  * New upstream release. Package description now includes Git.
+
+ -- Jason Heeris <jason.heeris at gmail.com>  Sun, 08 May 2011 09:41:40 +0800
+
 rabbitvcs (0.13.3-1) UNRELEASED; urgency=low
 
   [ Jason Heeris ]

Modified: packages/rabbitvcs/trunk/debian/control
===================================================================
--- packages/rabbitvcs/trunk/debian/control	2011-05-19 10:58:58 UTC (rev 17050)
+++ packages/rabbitvcs/trunk/debian/control	2011-05-19 14:01:54 UTC (rev 17051)
@@ -7,7 +7,7 @@
                python (>= 2.5.2)
 Build-Depends-Indep: python-support (>= 0.5.3),
                      pkg-config (>= 0.20)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 XS-Python-Version: >= 2.5
 Homepage: http://www.rabbitvcs.org
 
@@ -29,8 +29,8 @@
 Replaces: nautilussvn
 Description: Easy version control
  RabbitVCS is a set of graphical tools written to provide simple and
- straightforward access to Subversion (SVN). There are extensions for Nautilus,
- Thunar and GEdit, and a simple command-line interface.
+ straightforward access to Subversion (SVN) and Git. There are extensions for
+ Nautilus, Thunar and GEdit, and a simple command-line interface.
 
 Package: rabbitvcs-cli
 Architecture: all
@@ -39,7 +39,8 @@
          rabbitvcs-core (>= 0.13.1)
 Description: Command line interface for RabbitVCS
  RabbitVCS is a set of graphical tools written to provide simple and
- straightforward access to Subversion (SVN). This is the command-line interface.
+ straightforward access to Subversion (SVN) and Git. This is the command-line
+ interface.
 
 Package: rabbitvcs-gedit
 Architecture: all
@@ -48,8 +49,8 @@
          rabbitvcs-core (>= 0.13.1)
 Description: Gedit extension for RabbitVCS
  RabbitVCS is a set of graphical tools written to provide simple and
- straightforward access to Subversion (SVN). This is the extension for gedit
- text editor.
+ straightforward access to Subversion (SVN) and Git. This is the extension for
+ gedit text editor.
 
 Package: rabbitvcs-nautilus
 Architecture: all
@@ -60,6 +61,6 @@
          rabbitvcs-core (>= 0.13.1)
 Description: Nautilus extension for RabbitVCS
  RabbitVCS is a set of graphical tools written to provide simple and
- straightforward access to Subversion (SVN). This is the extension for the
- Nautilus file manager.
+ straightforward access to Subversion (SVN) and Git. This is the extension for
+ the Nautilus file manager.
  

Modified: packages/rabbitvcs/trunk/debian/copyright
===================================================================
--- packages/rabbitvcs/trunk/debian/copyright	2011-05-19 10:58:58 UTC (rev 17050)
+++ packages/rabbitvcs/trunk/debian/copyright	2011-05-19 14:01:54 UTC (rev 17051)
@@ -43,10 +43,33 @@
 
 Files: rabbitvcs/debug/ipython_view.py
 Copyright: 2007, IBM Corporation
-License: BSD
-    On Debian systems the full text of the BSD License can be found in
-    the '/usr/share/common-licenses/BSD' file.
+License:
+    All rights reserved.
 
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+      - Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+      - Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      - Neither the name of the IBM nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+        
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+
 Files: rabbitvcs/ui/wraplabel.py
 Copyright: 2005, VMware Inc.
 License: Expat

Modified: packages/rabbitvcs/trunk/debian/patches/99_setup.py.patch
===================================================================
--- packages/rabbitvcs/trunk/debian/patches/99_setup.py.patch	2011-05-19 10:58:58 UTC (rev 17050)
+++ packages/rabbitvcs/trunk/debian/patches/99_setup.py.patch	2011-05-19 14:01:54 UTC (rev 17051)
@@ -4,25 +4,20 @@
 Forwarded: not-needed
 Author: Jason Heeris <jason.heeris at gmail.com>
 
-diff -Nur -x '*.orig' -x '*~' rabbitvcs-0.13/setup.py rabbitvcs-0.13.new/setup.py
---- rabbitvcs-0.13/setup.py	2010-01-30 22:39:56.000000000 +0800
-+++ rabbitvcs-0.13.new/setup.py	2010-01-30 22:50:29.000000000 +0800
-@@ -141,10 +141,11 @@
+--- rabbitvcs-0.14/setup.py.orig	2011-02-18 21:04:33.000000000 +0800
++++ rabbitvcs-0.14/setup.py	2011-02-19 01:23:20.000000000 +0800
+@@ -154,13 +154,4 @@
+ # Post installation
  #
  
- # Make sure the icon cache is deleted and recreated
+-# Make sure the icon cache is deleted and recreated
 -if sys.argv[1] == "install":
--    print "Running gtk-update-icon-cache"
--    
--    subprocess.Popen(
--        ["gtk-update-icon-cache", icon_theme_directory], 
--        stdout=subprocess.PIPE
--    ).communicate()[0]
-+# Debian: this is not needed since hicolor-icon-cache (0.10-2)
-+# if sys.argv[1] == "install":
-+#     print "Running gtk-update-icon-cache"
-+#     
-+#     subprocess.Popen(
-+#         ["gtk-update-icon-cache", icon_theme_directory], 
-+#         stdout=subprocess.PIPE
-+#     ).communicate()[0]
+-
+-    if os.uname()[0] != 'Darwin':
+-        print "Running gtk-update-icon-cache"
+-        
+-        subprocess.Popen(
+-            ["gtk-update-icon-cache", icon_theme_directory], 
+-            stdout=subprocess.PIPE
+-        ).communicate()[0]
++# Icon cache rebuilding not needed


