[Python-modules-commits] r22945 - in packages/python-secretstorage/trunk/debian (4 files)

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

    Date: Saturday, November 10, 2012 @ 14:12:35
  Author: mitya57-guest
Revision: 22945

* Use pymarkups for building docs
  - replaced bzr_use_check_call.patch with use_pymarkups.patch
  - added build-dependency on python3-markups
* Bump Standards-Version to 3.9.4, no changes needed

Added:
  packages/python-secretstorage/trunk/debian/patches/use_pymarkups.patch
Modified:
  packages/python-secretstorage/trunk/debian/changelog
  packages/python-secretstorage/trunk/debian/control
  packages/python-secretstorage/trunk/debian/patches/series

Modified: packages/python-secretstorage/trunk/debian/changelog
===================================================================
--- packages/python-secretstorage/trunk/debian/changelog	2012-11-10 10:02:39 UTC (rev 22944)
+++ packages/python-secretstorage/trunk/debian/changelog	2012-11-10 14:12:35 UTC (rev 22945)
@@ -1,6 +1,10 @@
 python-secretstorage (0.2-2) UNRELEASED; urgency=low
 
   * Add missing python3 build
+  * Use pymarkups for building docs
+    - replaced bzr_use_check_call.patch with use_pymarkups.patch
+    - added build-dependency on python3-markups
+  * Bump Standards-Version to 3.9.4, no changes needed
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Sun, 16 Sep 2012 15:41:46 +0400
 

Modified: packages/python-secretstorage/trunk/debian/control
===================================================================
--- packages/python-secretstorage/trunk/debian/control	2012-11-10 10:02:39 UTC (rev 22944)
+++ packages/python-secretstorage/trunk/debian/control	2012-11-10 14:12:35 UTC (rev 22945)
@@ -4,8 +4,8 @@
 Maintainer: Dmitry Shachnev <mitya57 at gmail.com>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~), python3-all (>= 3.1.2-7~),
- retext-wpgen (>= 3.0.0-1~), python-markdown, python-pygments
-Standards-Version: 3.9.3
+ python3-markups, python-markdown, python-pygments
+Standards-Version: 3.9.4
 Homepage: https://launchpad.net/python-secretstorage
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-secretstorage/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-secretstorage/trunk/

Modified: packages/python-secretstorage/trunk/debian/patches/series
===================================================================
--- packages/python-secretstorage/trunk/debian/patches/series	2012-11-10 10:02:39 UTC (rev 22944)
+++ packages/python-secretstorage/trunk/debian/patches/series	2012-11-10 14:12:35 UTC (rev 22945)
@@ -1 +1 @@
-bzr_use_check_call.patch
+use_pymarkups.patch

Added: packages/python-secretstorage/trunk/debian/patches/use_pymarkups.patch
===================================================================
--- packages/python-secretstorage/trunk/debian/patches/use_pymarkups.patch	                        (rev 0)
+++ packages/python-secretstorage/trunk/debian/patches/use_pymarkups.patch	2012-11-10 14:12:35 UTC (rev 22945)
@@ -0,0 +1,41 @@
+Description: Use pymarkups for building docs (instead of wpgen)
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Origin: upstream, http://bazaar.launchpad.net/~mitya57/python-secretstorage/trunk/revision/38
+Last-Update: 2012-11-10
+
+=== modified file 'docs/markdown-extensions.txt'
+--- docs/markdown-extensions.txt	2012-06-20 09:09:42 +0000
++++ docs/markdown-extensions.txt	2012-11-01 15:00:08 +0000
+@@ -1,4 +1,3 @@
+ meta
+-attr_list
+ headerid
+ codehilite
+
+=== modified file 'setup.py'
+--- setup.py	2012-06-21 10:09:25 +0000
++++ setup.py	2012-11-01 14:39:54 +0000
+@@ -2,7 +2,6 @@
+ 
+ from distutils.core import setup, Command
+ from distutils.command.build import build
+-from subprocess import Popen
+ 
+ long_description = \
+ '''This module provides a way for securely storing passwords and other secrets.
+@@ -30,9 +29,11 @@
+ class build_docs(Command):
+ 	def run(self):
+ 		try:
+-			Popen(['wpgen', 'updateall'], cwd='docs')
+-		except OSError:
+-			print('Warning: wpgen not found, skipping build_docs')
++			from markups.web import WebLibrary
++			library = WebLibrary(working_dir='docs')
++			library.update_all()
++		except ImportError:
++			print('Warning: pymarkups not found, skipping build_docs')
+ 	def initialize_options(self): pass
+ 	def finalize_options(self): pass
+ 
+