[Python-apps-commits] r3701 - in packages/rdiff-backup/trunk/debian (4 files)
chaica-guest at users.alioth.debian.org
chaica-guest at users.alioth.debian.org
Mon Sep 7 21:47:14 UTC 2009
Date: Monday, September 7, 2009 @ 21:47:13
Author: chaica-guest
Revision: 3701
* Patch fixing restricted test-server option (Closes:#522278).
* debian/rules
- add call to dpatch
* Create debian/patches/01_fix_restricted_test-server_option.dpatch
* Create debian/README.source for dpatch
Added:
packages/rdiff-backup/trunk/debian/README.source
Modified:
packages/rdiff-backup/trunk/debian/changelog
packages/rdiff-backup/trunk/debian/patches/01_fix_restricted_test-server_option.dpatch
packages/rdiff-backup/trunk/debian/rules
Added: packages/rdiff-backup/trunk/debian/README.source
===================================================================
--- packages/rdiff-backup/trunk/debian/README.source (rev 0)
+++ packages/rdiff-backup/trunk/debian/README.source 2009-09-07 21:47:13 UTC (rev 3701)
@@ -0,0 +1,38 @@
+This package uses dpatch to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To get the fully patched source after unpacking the source package, cd
+to the root level of the source package and run:
+
+ debian/rules patch
+
+Removing a patch is as simple as removing its entry from the
+debian/patches/00list file, and please also remove the patch file
+itself.
+
+Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
+where you should replace XX with a new number and patchname with a
+descriptive shortname of the patch. You can then simply edit all the
+files your patch wants to edit, and then simply "exit 0" from the shell
+to actually create the patch file.
+
+To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
+and replace XX_patchname with the actual filename from debian/patches
+you want to use.
+
+To clean up afterwards again, "debian/rules unpatch" will do the
+work for you - or you can of course choose to call
+"fakeroot debian/rules clean" all together.
+
+
+---
+
+this documentation is part of dpatch package, and may be used by
+packages using dpatch to comply with policy on README.source. This
+documentation is meant to be useful to users who are not proficient in
+dpatch in doing work with dpatch-based packages. Please send any
+improvements to the BTS of dpatch package.
+
+original text by Gerfried Fuchs, edited by Junichi Uekawa <dancer at debian.org>
+10 Aug 2008.
Modified: packages/rdiff-backup/trunk/debian/changelog
===================================================================
--- packages/rdiff-backup/trunk/debian/changelog 2009-09-06 23:05:16 UTC (rev 3700)
+++ packages/rdiff-backup/trunk/debian/changelog 2009-09-07 21:47:13 UTC (rev 3701)
@@ -1,4 +1,4 @@
-rdiff-backup (1.2.8-4) UNRELEASED; urgency=low
+rdiff-backup (1.2.8-4) unstable; urgency=low
* Patch fixing restricted test-server option (Closes:#522278).
* debian/control
@@ -6,10 +6,11 @@
* debian/rules
- add call to dpatch
* Create debian/patches directory
- * Create 00list file
- * Create 01_fix_restricted_test-server_option.dpatch
+ * Create debian/patches/00list file
+ * Create debian/patches/01_fix_restricted_test-server_option.dpatch
+ * Create debian/README.source for dpatch
- -- Carl Chenet <chaica at ohmytux.com> Wed, 02 Sep 2009 22:27:41 +0200
+ -- Carl Chenet <chaica at ohmytux.com> Mon, 07 Sep 2009 23:42:56 +0200
rdiff-backup (1.2.8-3) unstable; urgency=low
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 2009-09-06 23:05:16 UTC (rev 3700)
+++ packages/rdiff-backup/trunk/debian/patches/01_fix_restricted_test-server_option.dpatch 2009-09-07 21:47:13 UTC (rev 3701)
@@ -1,54 +1,53 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_restricted_test-server_option.dpatch by <andreas at arrakis.se>
+## 01_fix_restricted_test-server_option.dpatch by Carl Chenet <chaica at ohmytux.com>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makes --test-server and --restrict work together again.
-## DP: Taken from http://lists.nongnu.org/archive/html/rdiff-backup-commits/2009-03/msg00023.html
-## DP: and from https://bugs.launchpad.net/ubuntu/+source/rdiff-backup/+bug/349072/comments/17
+## DP: Reimplemented from the Ubuntu patch by <andreas at arrakis.se>
+## DP: Original patch from : https://bugs.launchpad.net/ubuntu/+source/rdiff-backup/+bug/349072
@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-03 03:29:55.000000000 +0100
-+++ rdiff-backup-1.2.8/rdiff_backup/Main.py 2009-04-01 23:45:34.000000000 +0200
+--- 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
@@ -288,7 +288,7 @@
- elif action == "remove-older-than": RemoveOlderThan(rps[0])
- elif action == "restore": Restore(*rps)
- elif action == "restore-as-of": Restore(rps[0], rps[1], 1)
-- elif action == "test-server": SetConnections.TestConnections()
-+ elif action == "test-server": SetConnections.TestConnections(rps)
- elif action == "verify": Verify(rps[0])
- else: raise AssertionError("Unknown action " + action)
+ elif action == "remove-older-than": RemoveOlderThan(rps[0])
+ elif action == "restore": Restore(*rps)
+ elif action == "restore-as-of": Restore(rps[0], rps[1], 1)
+- elif action == "test-server": SetConnections.TestConnections()
++ elif action == "test-server": SetConnections.TestConnections(rps)
+ elif action == "verify": Verify(rps[0])
+ else: raise AssertionError("Unknown action " + action)
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-03 03:29:55.000000000 +0100
-+++ rdiff-backup-1.2.8/rdiff_backup/SetConnections.py 2009-04-01 23:45:40.000000000 +0200
-@@ -241,19 +241,24 @@
- Globals.backup_reader = Globals.isbackup_reader = \
- Globals.backup_writer = Globals.isbackup_writer = None
+--- 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 @@
+ Globals.backup_reader = Globals.isbackup_reader = \
+ Globals.backup_writer = Globals.isbackup_writer = None
-def TestConnections():
+def TestConnections(rpaths):
- """Test connections, printing results"""
- if len(Globals.connections) == 1: print "No remote connections specified"
- else:
-- for i in range(1, len(Globals.connections)): test_connection(i)
-+ assert len(Globals.connections) == len(rpaths) + 1
-+ for i in range(1, len(Globals.connections)):
-+ test_connection(i, rpaths[i-1])
+ """Test connections, printing results"""
+ if len(Globals.connections) == 1: print "No remote connections specified"
+ else:
+- for i in range(1, len(Globals.connections)): test_connection(i)
++ assert len(Globals.connections) == len(rpaths) + 1
++ for i in range(1, len(Globals.connections)):
++ test_connection(i, rpaths[i-1])
-def test_connection(conn_number):
+def test_connection(conn_number, rp):
- """Test connection. conn_number 0 is the local connection"""
- print "Testing server started by: ", __conn_remote_cmds[conn_number]
- conn = Globals.connections[conn_number]
- try:
- assert conn.Globals.get('current_time') is None
-- assert type(conn.os.listdir('.')) is list
-+ try:
-+ assert type(conn.os.getuid()) is int
-+ except AttributeError: # Windows doesn't support os.getuid()
-+ assert type(conn.os.listdir(rp.path)) is list
- version = conn.Globals.get('version')
- except:
- sys.stderr.write("Server tests failed\n")
-
+ """Test connection. conn_number 0 is the local connection"""
+ print "Testing server started by: ", __conn_remote_cmds[conn_number]
+ conn = Globals.connections[conn_number]
+ try:
+ assert conn.Globals.get('current_time') is None
+- assert type(conn.os.listdir('.')) is list
+- version = conn.Globals.get('version')
++ try:
++ assert type(conn.os.getuid()) is int
++ except AttributeError: # Windows doesn't support os.getuid()
++ assert type(conn.os.listdir(rp.path)) is list
+ except:
+ sys.stderr.write("Server tests failed\n")
+ raise
Modified: packages/rdiff-backup/trunk/debian/rules
===================================================================
--- packages/rdiff-backup/trunk/debian/rules 2009-09-06 23:05:16 UTC (rev 3700)
+++ packages/rdiff-backup/trunk/debian/rules 2009-09-07 21:47:13 UTC (rev 3701)
@@ -3,10 +3,10 @@
include /usr/share/dpatch/dpatch.make
build: patch-stamp
- dh build
+ dh build
clean: unpatch
- dh clean
+ dh clean
%:
dh $@
More information about the Python-apps-commits
mailing list