[Pkg-owncloud-commits] [SCM] python-owncloud.git branch, master, updated. upstream/0.2+1.e1d0c876-9-g6795130

Sandro Knauß bugs at sandroknauss.de
Mon Apr 8 00:24:11 UTC 2013


The following commit has been merged in the master branch:
commit 6795130922b2e0504d792ca810042c831ff5cef1
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Apr 8 01:37:48 2013 +0200

    adding patches downgrade and no_version_update
    
    downgrade:
    make sure that distribute_setup.py doesn't download an egg and uses
    debian version
    
    no_version_update:
    the version.py will updates the version.dat automatically, if it inside
    any git repo.

diff --git a/debian/patches/downgrade b/debian/patches/downgrade
new file mode 100644
index 0000000..c4e99f7
--- /dev/null
+++ b/debian/patches/downgrade
@@ -0,0 +1,13 @@
+Index: python-owncloud/distribute_setup.py
+===================================================================
+--- python-owncloud.orig/distribute_setup.py	2013-04-08 01:18:03.942897595 +0200
++++ python-owncloud/distribute_setup.py	2013-04-08 01:18:23.097084717 +0200
+@@ -49,7 +49,7 @@
+             args = [quote(arg) for arg in args]
+         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
+ 
+-DEFAULT_VERSION = "0.6.35"
++DEFAULT_VERSION = "0.6.23"
+ DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
+ SETUPTOOLS_FAKED_VERSION = "0.6c11"
+ 
diff --git a/debian/patches/no_version_update b/debian/patches/no_version_update
new file mode 100644
index 0000000..1bb6b95
--- /dev/null
+++ b/debian/patches/no_version_update
@@ -0,0 +1,13 @@
+Index: python-owncloud/csync/version.py
+===================================================================
+--- python-owncloud.orig/csync/version.py	2013-04-08 01:01:22.423039700 +0200
++++ python-owncloud/csync/version.py	2013-04-08 01:29:07.407762347 +0200
+@@ -55,7 +55,7 @@
+ 		self.asNpackd = self.makeNpackd()
+ 		return ver
+ 	def saveVersion(self):
+-		json.dump(self.version,open(self.verfile,'w'))
++		#json.dump(self.version,open(self.verfile,'w'))
+ 		#open(self.verfile,'w').write(str(self.asFloat))
+ 		return self.verfile
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6200050
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+downgrade
+no_version_update

-- 
python-owncloud.git



More information about the Pkg-owncloud-commits mailing list