[Pkg-owncloud-commits] [SCM] python-owncloud.git branch, master, updated. upstream/0.3-19-g7457b9d

[Sandro Knauß]

The following commit has been merged in the master branch:
commit c26b255876765a8e9eff2fa4c079f6a368f6ab96
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Tue May 14 00:22:28 2013 +0200

    Using DEP3 for debian/patches/no_version_update.patch

diff --git a/debian/patches/no_version_update b/debian/patches/no_version_update
deleted file mode 100644
index 1d5e133..0000000
--- a/debian/patches/no_version_update
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: python-owncloud/csync/version.py
-===================================================================
---- python-owncloud.orig/csync/version.py	2013-04-15 23:51:39.052567987 +0200
-+++ python-owncloud/csync/version.py	2013-04-15 23:52:46.505718197 +0200
-@@ -125,7 +125,7 @@
- #else:
- #    version = ver(os.path.join(BASE_DIR, 'version.dat'))
- 
--version = gitVersion(verfile)
-+version = ver(verfile)
- 
- if __name__ == '__main__':
- 	print 'Testing version.'
diff --git a/debian/patches/no_version_update.patch b/debian/patches/no_version_update.patch
new file mode 100644
index 0000000..17e8486
--- /dev/null
+++ b/debian/patches/no_version_update.patch
@@ -0,0 +1,22 @@
+Description: No automatic updating of csync/version.dat
+ pyOwnCloud checks, if the source code lives in a git enviroment.
+ If yes it automatically updates csync/version.dat.
+ This patches removes this feature, because the debian package
+ itself lives in a git repo.
+Author: Sandro Knauß <bugs at sandroknauss.de>
+Last-Update: 2013-04-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: python-owncloud/csync/version.py
+===================================================================
+--- python-owncloud.orig/csync/version.py	2013-04-15 23:51:39.052567987 +0200
++++ python-owncloud/csync/version.py	2013-04-15 23:52:46.505718197 +0200
+@@ -125,7 +125,7 @@
+ #else:
+ #    version = ver(os.path.join(BASE_DIR, 'version.dat'))
+ 
+-version = gitVersion(verfile)
++version = ver(verfile)
+ 
+ if __name__ == '__main__':
+ 	print 'Testing version.'
diff --git a/debian/patches/series b/debian/patches/series
index d0b082a..3bf2c64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-no_version_update
+no_version_update.patch

-- 
python-owncloud.git