[Python-apps-commits] r4809 - in packages/rdiff-backup/trunk/debian (3 files)

[chaica-guest at users.alioth.debian.org]

    Date: Saturday, February 20, 2010 @ 11:42:25
  Author: chaica-guest
Revision: 4809

  * debian/control
    - switching Maintainer to PAPT team
    - switching Uploaders to Carl Chenet <chaica at ohmytux.com>
  * debian/patches/01_fix_restricted_test-server_option.dpatch
    - added one line accidentely removed in the previous patch (Closes:#570627)

Modified:
  packages/rdiff-backup/trunk/debian/changelog
  packages/rdiff-backup/trunk/debian/control
  packages/rdiff-backup/trunk/debian/patches/01_fix_restricted_test-server_option.dpatch

Modified: packages/rdiff-backup/trunk/debian/changelog
===================================================================
--- packages/rdiff-backup/trunk/debian/changelog	2010-02-19 21:24:39 UTC (rev 4808)
+++ packages/rdiff-backup/trunk/debian/changelog	2010-02-20 11:42:25 UTC (rev 4809)
@@ -1,3 +1,13 @@
+rdiff-backup (1.2.8-6) unstable; urgency=low
+
+  * debian/control
+    - switching Maintainer to PAPT team
+    - switching Uploaders to Carl Chenet <chaica at ohmytux.com>
+  * debian/patches/01_fix_restricted_test-server_option.dpatch
+    - added one line accidentely removed in the previous patch (Closes:#570627)
+
+ -- Carl Chenet <chaica at ohmytux.com>  Sat, 20 Feb 2010 12:29:55 +0100
+
 rdiff-backup (1.2.8-5) unstable; urgency=low
 
   [ Carl Chenet ]

Modified: packages/rdiff-backup/trunk/debian/control
===================================================================
--- packages/rdiff-backup/trunk/debian/control	2010-02-19 21:24:39 UTC (rev 4808)
+++ packages/rdiff-backup/trunk/debian/control	2010-02-20 11:42:25 UTC (rev 4809)
@@ -1,8 +1,8 @@
 Source: rdiff-backup
 Section: utils
 Priority: optional
-Maintainer: Carl Chenet <chaica at ohmytux.com>
-Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Uploaders: Carl Chenet <chaica at ohmytux.com>
 Build-Depends:
  debhelper (>= 7.3.5~), python-support, python-all-dev, python-pylibacl, python-pyxattr,
  librsync-dev, dpatch

Modified: packages/rdiff-backup/trunk/debian/patches/01_fix_restricted_test-server_option.dpatch
===================================================================
--- packages/rdiff-backup/trunk/debian/patches/01_fix_restricted_test-server_option.dpatch	2010-02-19 21:24:39 UTC (rev 4808)
+++ packages/rdiff-backup/trunk/debian/patches/01_fix_restricted_test-server_option.dpatch	2010-02-20 11:42:25 UTC (rev 4809)
@@ -8,7 +8,7 @@
 @DPATCH@
 diff -urNad rdiff-backup-1.2.8~/rdiff_backup/Main.py rdiff-backup-1.2.8/rdiff_backup/Main.py
 --- rdiff-backup-1.2.8~/rdiff_backup/Main.py	2009-03-16 15:36:21.000000000 +0100
-+++ rdiff-backup-1.2.8/rdiff_backup/Main.py	2009-09-07 22:11:31.000000000 +0200
++++ rdiff-backup-1.2.8/rdiff_backup/Main.py	2010-02-20 11:26:27.000000000 +0100
 @@ -288,7 +288,7 @@
  	elif action == "remove-older-than": RemoveOlderThan(rps[0])
  	elif action == "restore": Restore(*rps)
@@ -20,8 +20,8 @@
  
 diff -urNad rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py rdiff-backup-1.2.8/rdiff_backup/SetConnections.py
 --- rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py	2009-03-16 15:36:21.000000000 +0100
-+++ rdiff-backup-1.2.8/rdiff_backup/SetConnections.py	2009-09-07 22:17:35.000000000 +0200
-@@ -241,20 +241,24 @@
++++ rdiff-backup-1.2.8/rdiff_backup/SetConnections.py	2010-02-20 11:29:43.000000000 +0100
+@@ -241,20 +241,25 @@
  	Globals.backup_reader = Globals.isbackup_reader = \
  		  Globals.backup_writer = Globals.isbackup_writer = None
  
@@ -43,7 +43,7 @@
  	try:
  		assert conn.Globals.get('current_time') is None
 -		assert type(conn.os.listdir('.')) is list
--		version = conn.Globals.get('version')
+ 		version = conn.Globals.get('version')
 +		try:
 +			assert type(conn.os.getuid()) is int
 +		except AttributeError: # Windows doesn't support os.getuid()