[Python-apps-commits] r9123 - in packages/retext/trunk/debian (7 files)

Tue Sep 18 10:13:35 UTC 2012

Date: Tuesday, September 18, 2012 @ 10:13:34
  Author: mitya57-guest
Revision: 9123

First version of 4.0 packaging

Modified:
  packages/retext/trunk/debian/changelog
  packages/retext/trunk/debian/control
  packages/retext/trunk/debian/retext.install
  packages/retext/trunk/debian/retext.manpages
  packages/retext/trunk/debian/rules
Deleted:
  packages/retext/trunk/debian/retext-wpgen.install
  packages/retext/trunk/debian/retext-wpgen.manpages

Modified: packages/retext/trunk/debian/changelog
===================================================================

--- packages/retext/trunk/debian/changelog	2012-09-18 09:43:45 UTC (rev 9122)
+++ packages/retext/trunk/debian/changelog	2012-09-18 10:13:34 UTC (rev 9123)
@@ -1,8 +1,12 @@
-retext (3.1.3-1) UNRELEASED; urgency=low
+retext (4.0~beta1) UNRELEASED; urgency=low
 
+  * New upstream beta release
+  * Switch to python3 and dh_python3
+  * Drop retext-wpgen package
+  * Refreshed dependencies
   * Add Slovak translation (from Transifex)
 
- -- Dmitry Shachnev <mitya57 at gmail.com>  Thu, 13 Sep 2012 18:37:51 +0400
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Tue, 18 Sep 2012 14:12:54 +0400
 
 retext (3.1.2-1) unstable; urgency=low
 

Modified: packages/retext/trunk/debian/control
===================================================================
--- packages/retext/trunk/debian/control	2012-09-18 09:43:45 UTC (rev 9122)
+++ packages/retext/trunk/debian/control	2012-09-18 10:13:34 UTC (rev 9123)
@@ -4,7 +4,7 @@
 Maintainer: Dmitry Shachnev <mitya57 at gmail.com>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), imagemagick
+Build-Depends: debhelper (>= 8), imagemagick, python3-all
 Standards-Version: 3.9.3
 Homepage: http://retext.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/retext/trunk/
@@ -12,9 +12,10 @@
 
 Package: retext
 Architecture: all
-Depends: ${misc:Depends}, python, python-qt4, python-markdown | python-docutils
-Recommends: retext-wpgen, python-markdown, python-docutils, python-enchant
-Suggests: python-gdata
+Depends: ${misc:Depends}, ${python3:Depends}, python3-pyqt4, python3-markups
+Recommends: python3-enchant
+Breaks: retext-wpgen
+Replaces: retext-wpgen
 Description: Simple text editor for Markdown and reStructuredText
  ReText is a simple editor for Markdown and reStructuredText markup languages.
  .
@@ -22,14 +23,3 @@
  Also, ReText can upload documents to Google Docs.
  .
  It is written in Python using Qt libraries.
-
-Package: retext-wpgen
-Architecture: all
-Depends: ${misc:Depends}, python, python-markdown | python-docutils
-Recommends: python-markdown, python-docutils
-Suggests: retext
-Description: Webpages generation tool for Markdown and reStructuredText
- ReText is a simple editor for Markdown and reStructuredText markup languages.
- .
- This package provides webpages generation tool that can be used from ReText or
- as a standalone application.

Deleted: packages/retext/trunk/debian/retext-wpgen.install
===================================================================
--- packages/retext/trunk/debian/retext-wpgen.install	2012-09-18 09:43:45 UTC (rev 9122)
+++ packages/retext/trunk/debian/retext-wpgen.install	2012-09-18 10:13:34 UTC (rev 9123)
@@ -1 +0,0 @@
-wpgen/templates/* /usr/share/wpgen

Deleted: packages/retext/trunk/debian/retext-wpgen.manpages
===================================================================
--- packages/retext/trunk/debian/retext-wpgen.manpages	2012-09-18 09:43:45 UTC (rev 9122)
+++ packages/retext/trunk/debian/retext-wpgen.manpages	2012-09-18 10:13:34 UTC (rev 9123)
@@ -1 +0,0 @@
-debian/wpgen.1

Modified: packages/retext/trunk/debian/retext.install
===================================================================
--- packages/retext/trunk/debian/retext.install	2012-09-18 09:43:45 UTC (rev 9122)
+++ packages/retext/trunk/debian/retext.install	2012-09-18 10:13:34 UTC (rev 9123)
@@ -2,3 +2,5 @@
 icons/retext.svg /usr/share/icons/hicolor/scalable/apps
 debian/retext.desktop /usr/share/applications
 debian/x-*.xml /usr/share/mime/packages
+wpgen/templates/* /usr/share/wpgen
+usr/share/retext/

Modified: packages/retext/trunk/debian/retext.manpages
===================================================================
--- packages/retext/trunk/debian/retext.manpages	2012-09-18 09:43:45 UTC (rev 9122)
+++ packages/retext/trunk/debian/retext.manpages	2012-09-18 10:13:34 UTC (rev 9123)
@@ -1 +1,2 @@
 debian/retext.1
+debian/wpgen.1

Modified: packages/retext/trunk/debian/rules
===================================================================
--- packages/retext/trunk/debian/rules	2012-09-18 09:43:45 UTC (rev 9122)
+++ packages/retext/trunk/debian/rules	2012-09-18 10:13:34 UTC (rev 9123)
@@ -3,18 +3,31 @@
 
 ICONSDIR=debian/retext/usr/share/icons/hicolor
 
+# python3 should be last so that scripts get a correct shebang
+PY3REQUESTED=$(shell py3versions -r)
+PY3DEFAULT=$(shell py3versions -d)
+PYTHON3=$(filter-out $(PY3DEFAULT),$(PY3REQUESTED)) python3
+
 %:
-	dh $@
+	dh $@ --with python3
 
+override_dh_auto_clean:
+	rm -rf build
+
+override_dh_auto_build:
+	set -ex; for python in $(PYTHON3); do \
+		$$python setup.py build; \
+	done
+
 override_dh_auto_install:
-	mkdir -p debian/retext/usr/bin/
-	mkdir -p debian/retext-wpgen/usr/bin/
-	cp retext.py debian/retext/usr/bin/retext
-	cp wpgen/wpgen.py debian/retext-wpgen/usr/bin/wpgen
+	set -ex; for python in $(PYTHON3); do \
+		$$python setup.py install --install-layout=deb --install-lib=/usr/share/retext \
+		--install-scripts=/usr/share/retext --root=debian/tmp; \
+	done
 	for size in 16 22 24 32 48 128; do \
-        	mkdir -p $(ICONSDIR)/$$size\x$$size/apps/; \
+		mkdir -p $(ICONSDIR)/$$size\x$$size/apps/; \
 		convert -resize $$size icons/retext.png $(ICONSDIR)/$$size\x$$size/apps/retext.png; \
-    	done
+	done
 
 override_dh_installchangelogs:
 	dh_installchangelogs changelog


