[Python-apps-commits] r3891 - in packages/txt2tags/trunk/debian (15 files)
jmw-guest at users.alioth.debian.org
jmw-guest at users.alioth.debian.org
Sun Oct 4 15:01:07 UTC 2009
Date: Sunday, October 4, 2009 @ 15:01:06
Author: jmw-guest
Revision: 3891
Revert split binary packages, merge everything into one txt2tags package
Added:
packages/txt2tags/trunk/debian/txt2tags.doc-base.quickref
(from rev 3726, packages/txt2tags/trunk/debian/txt2tags-common.doc-base.quickref)
packages/txt2tags/trunk/debian/txt2tags.doc-base.userguide
(from rev 3726, packages/txt2tags/trunk/debian/txt2tags-common.doc-base.userguide)
packages/txt2tags/trunk/debian/txt2tags.docs
(from rev 3726, packages/txt2tags/trunk/debian/txt2tags-common.docs)
packages/txt2tags/trunk/debian/txt2tags.examples
(from rev 3726, packages/txt2tags/trunk/debian/txt2tags-common.examples)
packages/txt2tags/trunk/debian/usr-bin-txt2tags
Modified:
packages/txt2tags/trunk/debian/changelog
packages/txt2tags/trunk/debian/control
packages/txt2tags/trunk/debian/rules
packages/txt2tags/trunk/debian/txt2tags.install
Deleted:
packages/txt2tags/trunk/debian/python-txt2tags.install
packages/txt2tags/trunk/debian/txt2tags-common.doc-base.quickref
packages/txt2tags/trunk/debian/txt2tags-common.doc-base.userguide
packages/txt2tags/trunk/debian/txt2tags-common.docs
packages/txt2tags/trunk/debian/txt2tags-common.examples
packages/txt2tags/trunk/debian/txt2tags.links
Modified: packages/txt2tags/trunk/debian/changelog
===================================================================
--- packages/txt2tags/trunk/debian/changelog 2009-10-04 14:59:59 UTC (rev 3890)
+++ packages/txt2tags/trunk/debian/changelog 2009-10-04 15:01:06 UTC (rev 3891)
@@ -1,11 +1,12 @@
txt2tags (2.5-2) unstable; urgency=low
[ Jonathan Wiltshire ]
- * Add call to dh_clean during clean sequence (closes: #541131)
- * New binary packages python-txt2tags (closes: #537797)
- and txt2tags-common for documentation and resources
- * Remove quote marks from Uploaders field
- * Standards version 3.8.3
+ * debian/rules: Add call to dh_clean during clean sequence (closes: #541131)
+ * Install as a public Python module and make /usr/bin/txt2tags
+ import it (closes: #537797)
+ * debian/control:
+ - Remove quote marks from Uploaders field
+ - Standards version 3.8.3
* Add README.source
* Register documentation with doc-base
@@ -13,7 +14,7 @@
* debian/watch
- Fix watch file to scan in googlecode
- -- Jonathan Wiltshire <debian at jwiltshire.org.uk> Mon, 14 Sep 2009 22:27:23 +0100
+ -- Jonathan Wiltshire <debian at jwiltshire.org.uk> Sun, 04 Oct 2009 15:31:15 +0100
txt2tags (2.5-1) unstable; urgency=low
Modified: packages/txt2tags/trunk/debian/control
===================================================================
--- packages/txt2tags/trunk/debian/control 2009-10-04 14:59:59 UTC (rev 3890)
+++ packages/txt2tags/trunk/debian/control 2009-10-04 15:01:06 UTC (rev 3891)
@@ -12,7 +12,7 @@
Package: txt2tags
Architecture: all
-Depends: txt2tags-common (>= ${source:Version}), python, ${python:Depends}, ${misc:Depends}
+Depends: python, ${python:Depends}, ${misc:Depends}
Suggests: python-tk
Description: conversion tool to generating several file formats
txt2tags is a document generator written in Python that
@@ -29,29 +29,3 @@
.
With txt2tags, you focuses your mind on the document CONTENT, and
forget about formatting. Just let the program do this dirty job.
-
-Package: python-txt2tags
-Architecture: all
-Section: python
-Depends: txt2tags-common (>= ${source:Version}), python, ${python:Depends}, ${misc:Depends}
-Suggests: python-tk
-Description: Python module for txt2tags
- txt2tags is a document generator written in Python that
- generates HTML, XHTML, SGML, LaTeX, Lout, man page, Wikipedia,
- Google Code Wiki, DokuWiki, MoinMoin, Magic Point and PageMaker
- documents from a plain text file with little marks.
- .
- This package install txt2tags as a true Python module, so that it can be
- used from the Python interpreter without any expensive shell calls.
-
-Package: txt2tags-common
-Architecture: all
-Depends: ${misc:Depends}
-Description: common files for txt2tags and python-txt2tags
- txt2tags is a document generator written in Python that
- generates HTML, XHTML, SGML, LaTeX, Lout, man page, Wikipedia,
- Google Code Wiki, DokuWiki, MoinMoin, Magic Point and PageMaker
- documents from a plain text file with little marks.
- .
- This package installs the txt2tags translations and example material
- on behalf of the binary and Python module packages.
Deleted: packages/txt2tags/trunk/debian/python-txt2tags.install
===================================================================
--- packages/txt2tags/trunk/debian/python-txt2tags.install 2009-10-04 14:59:59 UTC (rev 3890)
+++ packages/txt2tags/trunk/debian/python-txt2tags.install 2009-10-04 15:01:06 UTC (rev 3891)
@@ -1 +0,0 @@
-txt2tags.py usr/share/python-support/python-txt2tags
Modified: packages/txt2tags/trunk/debian/rules
===================================================================
--- packages/txt2tags/trunk/debian/rules 2009-10-04 14:59:59 UTC (rev 3890)
+++ packages/txt2tags/trunk/debian/rules 2009-10-04 15:01:06 UTC (rev 3891)
@@ -7,7 +7,7 @@
dh_quilt_patch
cd doc && $(MAKE) clean
cd po && $(MAKE) clean
- rm -f txt2tags.py
+ rm -rf build
dh_clean
dh_quilt_unpatch
@@ -15,17 +15,18 @@
dh_quilt_patch
dh_auto_build
cd doc && $(MAKE) build
- cp txt2tags txt2tags.py
+ mkdir build
+ cp txt2tags build/txt2tags.py
+ cp debian/usr-bin-txt2tags build/txt2tags
override_dh_install:
dh_install
- cd po && $(MAKE) install BASEDIR=$(CURDIR)/debian/txt2tags-common
+ cd po && $(MAKE) install BASEDIR=$(CURDIR)/debian/txt2tags
override_dh_compress:
# get rid of macos temporary files in the build tree
# dh_compress is just a late, useful place to do this
find $(CURDIR)/debian/txt2tags -name '*._*' | xargs rm -f
- find $(CURDIR)/debian/txt2tags-common -name '*._*' | xargs rm -f
dh_compress
%:
Deleted: packages/txt2tags/trunk/debian/txt2tags-common.doc-base.quickref
===================================================================
--- packages/txt2tags/trunk/debian/txt2tags-common.doc-base.quickref 2009-10-04 14:59:59 UTC (rev 3890)
+++ packages/txt2tags/trunk/debian/txt2tags-common.doc-base.quickref 2009-10-04 15:01:06 UTC (rev 3891)
@@ -1,7 +0,0 @@
-Document: txt2tags-quickref
-Title: txt2tags Quick Reference
-Author: Aurelio Jargas
-Section: Text
-
-Format: PDF
-Files: /usr/share/doc/txt2tags-common/txt2tags-quickref.pdf.gz
Deleted: packages/txt2tags/trunk/debian/txt2tags-common.doc-base.userguide
===================================================================
--- packages/txt2tags/trunk/debian/txt2tags-common.doc-base.userguide 2009-10-04 14:59:59 UTC (rev 3890)
+++ packages/txt2tags/trunk/debian/txt2tags-common.doc-base.userguide 2009-10-04 15:01:06 UTC (rev 3891)
@@ -1,7 +0,0 @@
-Document: txt2tags-userguide
-Title: txt2tags User Guide
-Author: Aurelio Jargas
-Section: Text
-
-Format: PDF
-Files: /usr/share/doc/txt2tags-common/userguide.pdf.gz
Deleted: packages/txt2tags/trunk/debian/txt2tags-common.docs
===================================================================
--- packages/txt2tags/trunk/debian/txt2tags-common.docs 2009-10-04 14:59:59 UTC (rev 3890)
+++ packages/txt2tags/trunk/debian/txt2tags-common.docs 2009-10-04 15:01:06 UTC (rev 3891)
@@ -1,4 +0,0 @@
-README
-TODO
-doc/txt2tags-quickref.pdf
-doc/userguide.pdf
Deleted: packages/txt2tags/trunk/debian/txt2tags-common.examples
===================================================================
--- packages/txt2tags/trunk/debian/txt2tags-common.examples 2009-10-04 14:59:59 UTC (rev 3890)
+++ packages/txt2tags/trunk/debian/txt2tags-common.examples 2009-10-04 15:01:06 UTC (rev 3891)
@@ -1 +0,0 @@
-samples/*
Copied: packages/txt2tags/trunk/debian/txt2tags.doc-base.quickref (from rev 3726, packages/txt2tags/trunk/debian/txt2tags-common.doc-base.quickref)
===================================================================
--- packages/txt2tags/trunk/debian/txt2tags.doc-base.quickref (rev 0)
+++ packages/txt2tags/trunk/debian/txt2tags.doc-base.quickref 2009-10-04 15:01:06 UTC (rev 3891)
@@ -0,0 +1,7 @@
+Document: txt2tags-quickref
+Title: txt2tags Quick Reference
+Author: Aurelio Jargas
+Section: Text
+
+Format: PDF
+Files: /usr/share/doc/txt2tags/txt2tags-quickref.pdf.gz
Copied: packages/txt2tags/trunk/debian/txt2tags.doc-base.userguide (from rev 3726, packages/txt2tags/trunk/debian/txt2tags-common.doc-base.userguide)
===================================================================
--- packages/txt2tags/trunk/debian/txt2tags.doc-base.userguide (rev 0)
+++ packages/txt2tags/trunk/debian/txt2tags.doc-base.userguide 2009-10-04 15:01:06 UTC (rev 3891)
@@ -0,0 +1,7 @@
+Document: txt2tags-userguide
+Title: txt2tags User Guide
+Author: Aurelio Jargas
+Section: Text
+
+Format: PDF
+Files: /usr/share/doc/txt2tags/userguide.pdf.gz
Copied: packages/txt2tags/trunk/debian/txt2tags.docs (from rev 3726, packages/txt2tags/trunk/debian/txt2tags-common.docs)
===================================================================
--- packages/txt2tags/trunk/debian/txt2tags.docs (rev 0)
+++ packages/txt2tags/trunk/debian/txt2tags.docs 2009-10-04 15:01:06 UTC (rev 3891)
@@ -0,0 +1,4 @@
+README
+TODO
+doc/txt2tags-quickref.pdf
+doc/userguide.pdf
Copied: packages/txt2tags/trunk/debian/txt2tags.examples (from rev 3726, packages/txt2tags/trunk/debian/txt2tags-common.examples)
===================================================================
--- packages/txt2tags/trunk/debian/txt2tags.examples (rev 0)
+++ packages/txt2tags/trunk/debian/txt2tags.examples 2009-10-04 15:01:06 UTC (rev 3891)
@@ -0,0 +1 @@
+samples/*
Modified: packages/txt2tags/trunk/debian/txt2tags.install
===================================================================
--- packages/txt2tags/trunk/debian/txt2tags.install 2009-10-04 14:59:59 UTC (rev 3890)
+++ packages/txt2tags/trunk/debian/txt2tags.install 2009-10-04 15:01:06 UTC (rev 3891)
@@ -1 +1,2 @@
-txt2tags usr/bin
+build/txt2tags usr/bin
+build/txt2tags.py usr/share/python-support/python-txt2tags
Deleted: packages/txt2tags/trunk/debian/txt2tags.links
===================================================================
--- packages/txt2tags/trunk/debian/txt2tags.links 2009-10-04 14:59:59 UTC (rev 3890)
+++ packages/txt2tags/trunk/debian/txt2tags.links 2009-10-04 15:01:06 UTC (rev 3891)
@@ -1 +0,0 @@
-/usr/share/doc/txt2tags-common/examples usr/share/doc/txt2tags/examples
Added: packages/txt2tags/trunk/debian/usr-bin-txt2tags
===================================================================
--- packages/txt2tags/trunk/debian/usr-bin-txt2tags (rev 0)
+++ packages/txt2tags/trunk/debian/usr-bin-txt2tags 2009-10-04 15:01:06 UTC (rev 3891)
@@ -0,0 +1,4 @@
+#!/usr/bin/python
+
+import txt2tags;
+txt2tags.exec_command_line();
More information about the Python-apps-commits
mailing list