[Python-modules-commits] r22260 - in packages/transmissionrpc/trunk/debian (5 files)

[bernat at users.alioth.debian.org]

    Date: Saturday, June 23, 2012 @ 16:09:33
  Author: bernat
Revision: 22260

Switch to dh tiny ruleset. And add documentation.

Modified:
  packages/transmissionrpc/trunk/debian/changelog
  packages/transmissionrpc/trunk/debian/control
  packages/transmissionrpc/trunk/debian/docs
  packages/transmissionrpc/trunk/debian/patches/01_setup.patch
  packages/transmissionrpc/trunk/debian/rules

Modified: packages/transmissionrpc/trunk/debian/changelog
===================================================================
--- packages/transmissionrpc/trunk/debian/changelog	2012-06-23 15:45:09 UTC (rev 22259)
+++ packages/transmissionrpc/trunk/debian/changelog	2012-06-23 16:09:33 UTC (rev 22260)
@@ -2,6 +2,8 @@
 
   * New upstream release.
   * Bump Standards-Version to 3.9.3.
+  * Switch to debhelper minimal ruleset.
+  * Compile documentation with Sphinx.
 
  -- Vincent Bernat <bernat at debian.org>  Sat, 23 Jun 2012 17:43:37 +0200
 

Modified: packages/transmissionrpc/trunk/debian/control
===================================================================
--- packages/transmissionrpc/trunk/debian/control	2012-06-23 15:45:09 UTC (rev 22259)
+++ packages/transmissionrpc/trunk/debian/control	2012-06-23 16:09:33 UTC (rev 22260)
@@ -3,8 +3,10 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Timur Birsh <taem at linukz.org>, Vincent Bernat <bernat at debian.org>
-Build-Depends: debhelper (>= 7), python-setuptools, python-simplejson (>= 1.7.1) | python (>= 2.6)
-Build-Depends-Indep: python (>= 2.5), python-support (>= 0.8)
+Build-Depends: debhelper (>= 7),
+               python-setuptools,
+               python (>= 2.6.6-3~),
+               python-sphinx (>= 1.0.7+dfsg) | python3-sphinx
 Standards-Version: 3.9.3
 Homepage: http://bitbucket.org/blueluna/transmissionrpc/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/transmissionrpc/trunk/
@@ -12,7 +14,7 @@
 
 Package: python-transmissionrpc
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-simplejson (>= 1.7.1) | python (>= 2.6)
+Depends: ${python:Depends}, ${misc:Depends}, ${sphinxdoc:Depends}
 Suggests: transmission-daemon (>= 1.31)
 Description: Transmission RPC client module for Python
  transmissionrpc is a Python module implementing the JSON-RPC client protocol

Modified: packages/transmissionrpc/trunk/debian/docs
===================================================================
--- packages/transmissionrpc/trunk/debian/docs	2012-06-23 15:45:09 UTC (rev 22259)
+++ packages/transmissionrpc/trunk/debian/docs	2012-06-23 16:09:33 UTC (rev 22260)
@@ -1 +1,2 @@
 README
+html/*

Modified: packages/transmissionrpc/trunk/debian/patches/01_setup.patch
===================================================================
--- packages/transmissionrpc/trunk/debian/patches/01_setup.patch	2012-06-23 15:45:09 UTC (rev 22259)
+++ packages/transmissionrpc/trunk/debian/patches/01_setup.patch	2012-06-23 16:09:33 UTC (rev 22260)
@@ -3,7 +3,7 @@
 --- a/setup.py	2009-05-24 05:09:50.000000000 +0600
 +++ b/setup.py	2009-06-23 14:01:09.000000000 +0600
 @@ -1,13 +1,7 @@
- # Copyright (c) 2008-2010 Erik Svensson <erik.public at gmail.com>
+ # Copyright (c) 2008-2011 Erik Svensson <erik.public at gmail.com>
  # Licensed under the MIT license.
  
 -from setuptools import setup

Modified: packages/transmissionrpc/trunk/debian/rules
===================================================================
--- packages/transmissionrpc/trunk/debian/rules	2012-06-23 15:45:09 UTC (rev 22259)
+++ packages/transmissionrpc/trunk/debian/rules	2012-06-23 16:09:33 UTC (rev 22260)
@@ -1,44 +1,18 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-PKG_DIR := debian/python-transmissionrpc/usr
-CONTRIB_DIR := $(PKG_DIR)/share/doc/python-transmissionrpc/contrib
+%:
+	dh --with=python2,sphinxdoc $@
 
-build:
+override_dh_install:
+	install -m 755 contrib/helical.py debian/python-transmissionrpc/usr/bin/helical
 
-clean:
-	dh_testdir
-	dh_testroot
-	[ ! -d build ] || rm -rf build
-	find . -name '*\.pyc' -delete
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep  
-
-	python setup.py install --no-compile \
-		--root=$(CURDIR)/debian/python-transmissionrpc
-
-	# Install helical.py to /usr/bin
-	install -Dm 755 contrib/helical.py $(PKG_DIR)/bin/helical
-
-binary-indep: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
+override_dh_installdocs:
+	sphinx-build -q doc html
 	dh_installdocs
+override_dh_installman:
 	dh_installman debian/helical.1
-	dh_compress
-	dh_fixperms
-	dh_pysupport
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary-arch: install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_clean:
+	dh_clean
+	-rm -rf html