[Python-modules-commits] r2791 - in /packages/ll-xist/trunk/debian: control manpage_source/doc2txt.sgml manpage_source/dtd2xsc.sgml patches/00list patches/remove-setuptools.dpatch rules

Thu Jul 19 00:31:02 UTC 2007

Author: bzed-guest
Date: Thu Jul 19 00:31:02 2007
New Revision: 2791

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2791
Log:
a few more updates... on the way to xist --> new.

Added:
    packages/ll-xist/trunk/debian/patches/remove-setuptools.dpatch   (with props)
Removed:
    packages/ll-xist/trunk/debian/manpage_source/doc2txt.sgml
Modified:
    packages/ll-xist/trunk/debian/control
    packages/ll-xist/trunk/debian/manpage_source/dtd2xsc.sgml
    packages/ll-xist/trunk/debian/patches/00list
    packages/ll-xist/trunk/debian/rules

Modified: packages/ll-xist/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/ll-xist/trunk/debian/control?rev=2791&op=diff
==============================================================================

--- packages/ll-xist/trunk/debian/control (original)
+++ packages/ll-xist/trunk/debian/control Thu Jul 19 00:31:02 2007
@@ -11,7 +11,9 @@
 
 Package: python-ll-xist
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-ll-core (>= 1.7.1)
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends},
+ python-ll-core (>= 1.7.1), python-xml, python-libxml2
+Suggests: elinks
 Description: Extensible HTML and XML generator and DOM parser
  XIST is an extensible HTML and XML generator written in Python and also
  a DOM parser (built on top of SAX2) with a very simple and pythonesque

Modified: packages/ll-xist/trunk/debian/manpage_source/dtd2xsc.sgml
URL: http://svn.debian.org/wsvn/python-modules/packages/ll-xist/trunk/debian/manpage_source/dtd2xsc.sgml?rev=2791&op=diff
==============================================================================
--- packages/ll-xist/trunk/debian/manpage_source/dtd2xsc.sgml (original)
+++ packages/ll-xist/trunk/debian/manpage_source/dtd2xsc.sgml Thu Jul 19 00:31:02 2007
@@ -17,17 +17,17 @@
   -->
 
   <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
-  <!ENTITY dhsurname   "<surname>SURNAME</surname>">
+  <!ENTITY dhfirstname "<firstname>BERND</firstname>">
+  <!ENTITY dhsurname   "<surname>ZEIMETZ</surname>">
   <!-- Please adjust the date whenever revising the manpage. -->
   <!ENTITY dhdate      "<date>July 18, 2007</date>">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
   <!ENTITY dhemail     "<email>bernd at bzed.de</email>">
   <!ENTITY dhusername  "Bernd Zeimetz">
   <!ENTITY dhucpackage "<refentrytitle>PYTHON-LL-XIST</refentrytitle>">
-  <!ENTITY dhpackage   "python-ll-xist">
+  <!ENTITY dhpackage   "dtd2xsc">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
@@ -44,7 +44,7 @@
       &dhsurname;
     </author>
     <copyright>
-      <year>2003</year>
+      <year>2007</year>
       <holder>&dhusername;</holder>
     </copyright>
     &dhdate;
@@ -57,7 +57,7 @@
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>program to do something</refpurpose>
+    <refpurpose></refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>

Modified: packages/ll-xist/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/ll-xist/trunk/debian/patches/00list?rev=2791&op=diff
==============================================================================
--- packages/ll-xist/trunk/debian/patches/00list (original)
+++ packages/ll-xist/trunk/debian/patches/00list Thu Jul 19 00:31:02 2007
@@ -1,1 +1,2 @@
 remove-bogus-shebangs
+remove-setuptools

Added: packages/ll-xist/trunk/debian/patches/remove-setuptools.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/ll-xist/trunk/debian/patches/remove-setuptools.dpatch?rev=2791&op=file
==============================================================================
--- packages/ll-xist/trunk/debian/patches/remove-setuptools.dpatch (added)
+++ packages/ll-xist/trunk/debian/patches/remove-setuptools.dpatch Thu Jul 19 00:31:02 2007
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove-setuptools.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: distutils is still the better choice of evil things
+
+ at DPATCH@
+diff -urNad ll-xist~/setup.py ll-xist/setup.py
+--- ll-xist~/setup.py	2007-07-17 14:06:08.000000000 +0200
++++ ll-xist/setup.py	2007-07-19 01:09:17.000000000 +0200
+@@ -7,10 +7,7 @@
+ # $Source: /data/cvsroot/LivingLogic/Python/xist/setup.py,v $
+ 
+ 
+-try:
+-	import setuptools as tools
+-except ImportError:
+-	from distutils import core as tools
++from distutils import core as tools
+ 
+ import textwrap
+ 

Propchange: packages/ll-xist/trunk/debian/patches/remove-setuptools.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/ll-xist/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/ll-xist/trunk/debian/rules?rev=2791&op=diff
==============================================================================
--- packages/ll-xist/trunk/debian/rules (original)
+++ packages/ll-xist/trunk/debian/rules Thu Jul 19 00:31:02 2007
@@ -9,7 +9,7 @@
 include /usr/share/cdbs/1/rules/dpatch.mk
 
 
-MANPAGES = doc2txt.1 tld2xsc.1 dtd2xsc.1 xml2xsc.1
+MANPAGES =  tld2xsc.1 dtd2xsc.1 xml2xsc.1
 
 %.1: debian/manpage_source/%.sgml
 	docbook-to-man $< > $@
@@ -18,9 +18,11 @@
 
 XISTBINDIR = $(CURDIR)/debian/python-ll-xist/usr/bin
 install/python-ll-xist::
+	## do we really need a py version of doc2txt in /usr/bin?
+	rm -f $(XISTBINDIR)/doc2txt $(XISTBINDIR)/doc2txt.py
 	## clean /usr/bin up - no need for two file which
 	## do the same thing
-	for bin in doc2txt tld2xsc dtd2xsc xml2xsc; do \
+	for bin in tld2xsc dtd2xsc xml2xsc; do \
 	  mv $(XISTBINDIR)/$$bin.py $(XISTBINDIR)/$$bin; \
 	done
 	## this file is really, really bad. It contains py code


