[Pkg-asciidoc-commits] r52 - in trunk/debian: . patches

Alexander Wirt formorer at alioth.debian.org
Wed Jun 10 19:10:30 UTC 2009 

Author: formorer
Date: 2009-06-10 19:10:30 +0000 (Wed, 10 Jun 2009)
New Revision: 52

Modified:
   trunk/debian/README.Debian
   trunk/debian/asciidoc.install
   trunk/debian/asciidoc.links
   trunk/debian/changelog
   trunk/debian/compat
   trunk/debian/control
   trunk/debian/docs
   trunk/debian/patches/code-filter.py-python-path.patch
   trunk/debian/patches/normpath-not-realpath.patch
   trunk/debian/rules
Log:
New upstream version


Modified: trunk/debian/README.Debian
===================================================================
--- trunk/debian/README.Debian	2009-01-14 07:11:16 UTC (rev 51)
+++ trunk/debian/README.Debian	2009-06-10 19:10:30 UTC (rev 52)
@@ -11,8 +11,4 @@
 - "userguide.html" talks about a fo.xsl file, this file is located 
   in /etc/asciidoc/docbook-xsl/fo.xsl (Bug:#344729).
 
-- To get odt (Openoffice.org) support you need to install the docbook2odf
-  package which it not yet in debian. 
-  See http://open.comsultia.com/docbook2odf/download for debian packages
-
  -- Alexander Wirt <formorer at debian.org>  Tue, Jul 25 2007 09:29:17 +0200

Modified: trunk/debian/asciidoc.install
===================================================================
--- trunk/debian/asciidoc.install	2009-01-14 07:11:16 UTC (rev 51)
+++ trunk/debian/asciidoc.install	2009-06-10 19:10:30 UTC (rev 52)
@@ -2,6 +2,7 @@
 
 debian/asciidoc.yaml /usr/share/vim/registry
 stylesheets /etc/asciidoc/
+dblatex /etc/asciidoc/
 docbook-xsl /etc/asciidoc/
 images /usr/share/asciidoc/
 javascripts /usr/share/asciidoc/
@@ -14,5 +15,3 @@
 vim/ftdetect/asciidoc_filetype.vim /usr/share/vim/addons/ftplugin/
 vim/syntax/asciidoc.vim /usr/share/vim/addons/syntax/
 
-examples/website/* /usr/share/doc/asciidoc/examples/
-

Modified: trunk/debian/asciidoc.links
===================================================================
--- trunk/debian/asciidoc.links	2009-01-14 07:11:16 UTC (rev 51)
+++ trunk/debian/asciidoc.links	2009-06-10 19:10:30 UTC (rev 52)
@@ -1,17 +1,4 @@
-usr/share/asciidoc/images usr/share/doc/asciidoc/images
 /etc/asciidoc/stylesheets/docbook-xsl.css /usr/share/doc/asciidoc/docbook-xsl.css
 etc/asciidoc/stylesheets usr/share/asciidoc/stylesheets
-usr/share/doc/asciidoc/changelog.gz usr/share/doc/asciidoc/examples/website/CHANGELOG.txt.gz
-usr/share/doc/asciidoc/README usr/share/doc/asciidoc/examples/website/README.txt
-usr/share/doc/asciidoc/customers.csv usr/share/doc/asciidoc/examples/website/customers.csv
-usr/share/doc/asciidoc/asciidoc.1.txt usr/share/doc/asciidoc/examples/website/manpage.txt
-usr/share/doc/asciidoc/asciidoc.txt.gz usr/share/doc/asciidoc/examples/website/asciidoc.txt.gz
-etc/asciidoc/stylesheets/xhtml11-manpage.css usr/share/doc/asciidoc/examples/website/xhtml11-manpage.css
-etc/asciidoc/stylesheets/xhtml11-quirks.css usr/share/doc/asciidoc/examples/website/xhtml11-quirks.css
-etc/asciidoc/stylesheets/xhtml11.css usr/share/doc/asciidoc/examples/website/xhtml11.css
-usr/share/doc/asciidoc/asciimath.txt usr/share/doc/asciidoc/examples/website/asciimath.txt
-usr/share/doc/asciidoc/asciimath.html usr/share/doc/asciidoc/examples/website/asciimath.html
+usr/share/asciidoc/images etc/asciidoc/images
 usr/share/asciidoc/javascripts /etc/asciidoc/javascripts
-usr/share/doc/asciidoc/a2x.1.txt usr/share/doc/asciidoc/examples/website/a2x.1.txt
-usr/share/doc/asciidoc/asciidoc-docbook-xsl.txt usr/share/doc/asciidoc/examples/website/asciidoc-docbook-xsl.txt
-usr/share/doc/asciidoc/asciidoc-graphviz-sample.txt usr/share/doc/asciidoc/examples/website/asciidoc-graphviz-sample.txt

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-01-14 07:11:16 UTC (rev 51)
+++ trunk/debian/changelog	2009-06-10 19:10:30 UTC (rev 52)
@@ -1,9 +1,19 @@
-asciidoc (8.3.3-1) unstable; urgency=low
+asciidoc (8.4.4-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release (Closes: #511332)
+  * Bump standards version (no changes)
+  * Mention docbook2odt (Closes: #524404)
+  * Remove symlink hell (Closes: #524888)
 
- -- Alexander Wirt <formorer at debian.org>  Tue, 13 Jan 2009 06:54:37 +0100
+ -- Alexander Wirt <formorer at debian.org>  Sun, 26 Apr 2009 13:14:42 +0200
 
+asciidoc (8.2.7-3) unstable; urgency=low
+
+  * Replace fop with dblatex (Closes: #452470)
+  * Install dblatex supportfiles (Closes: #494531, #496987)
+
+ -- Alexander Wirt <formorer at debian.org>  Fri, 13 Mar 2009 10:27:10 +0100
+
 asciidoc (8.2.7-2) unstable; urgency=low
 
   * Reintroduce normpatch-not-realpath.patch which fixes some FTBFS 

Modified: trunk/debian/compat
===================================================================
--- trunk/debian/compat	2009-01-14 07:11:16 UTC (rev 51)
+++ trunk/debian/compat	2009-06-10 19:10:30 UTC (rev 52)
@@ -1 +1 @@
-4
+5

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2009-01-14 07:11:16 UTC (rev 51)
+++ trunk/debian/control	2009-06-10 19:10:30 UTC (rev 52)
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Fredrik Steen <stone at debian.org>
 Uploaders: Alexander Wirt <formorer at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper
 Build-Depends-Indep: patchutils (>= 0.2.25), xmlto, python (>= 2.3)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 
 Package: asciidoc
 Architecture: all
-Depends: python (>= 2.3)
-Recommends: docbook-utils, xmlto, fop, source-highlight, vim-addon-manager
+Depends: python (>= 2.3), ${misc:Depends}
+Recommends: docbook-utils, xmlto, dblatex, source-highlight, vim-addon-manager
 Description: Highly configurable text format for writing documentation
  AsciiDoc is a text document format for writing articles, books, manuals and
  UNIX man pages. AsciiDoc files can be translated to HTML (with or without

Modified: trunk/debian/docs
===================================================================
--- trunk/debian/docs	2009-01-14 07:11:16 UTC (rev 51)
+++ trunk/debian/docs	2009-06-10 19:10:30 UTC (rev 52)
@@ -1,2 +1 @@
 README
-doc/*

Modified: trunk/debian/patches/code-filter.py-python-path.patch
===================================================================
--- trunk/debian/patches/code-filter.py-python-path.patch	2009-01-14 07:11:16 UTC (rev 51)
+++ trunk/debian/patches/code-filter.py-python-path.patch	2009-06-10 19:10:30 UTC (rev 52)
@@ -1,8 +1,9 @@
---- filters/code/code-filter.py	2005-01-24 02:26:50.000000000 +0100
-+++ filters/code/code-filter.py.stone	2005-03-30 08:03:34.000000000 +0200
+diff -Nur -x '*.orig' -x '*~' asciidoc-8.4.4/filters/code/code-filter.py asciidoc-8.4.4.new/filters/code/code-filter.py
+--- asciidoc-8.4.4/filters/code/code-filter.py	2008-12-31 02:37:47.000000000 +0100
++++ asciidoc-8.4.4.new/filters/code/code-filter.py	2009-04-26 13:16:23.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  '''
- code-filter - AsciiDoc filter to highlight language keywords
- 
+ NAME
+     code-filter - AsciiDoc filter to highlight language keywords

Modified: trunk/debian/patches/normpath-not-realpath.patch
===================================================================
--- trunk/debian/patches/normpath-not-realpath.patch	2009-01-14 07:11:16 UTC (rev 51)
+++ trunk/debian/patches/normpath-not-realpath.patch	2009-06-10 19:10:30 UTC (rev 52)
@@ -1,7 +1,7 @@
-diff -urNad asciidoc-8.3.3~/asciidoc.py asciidoc-8.3.3/asciidoc.py
---- asciidoc-8.3.3~/asciidoc.py	2009-01-02 00:33:52.000000000 +0100
-+++ asciidoc-8.3.3/asciidoc.py	2009-01-13 06:59:40.000000000 +0100
-@@ -149,7 +149,7 @@
+diff -Nur -x '*.orig' -x '*~' asciidoc-8.4.4/asciidoc.py asciidoc-8.4.4.new/asciidoc.py
+--- asciidoc-8.4.4/asciidoc.py	2009-04-26 01:03:14.000000000 +0200
++++ asciidoc-8.4.4.new/asciidoc.py	2009-04-26 13:18:43.000000000 +0200
+@@ -195,7 +195,7 @@
      else:
          assert os.path.isdir(directory)
          directory = os.path.realpath(directory)

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2009-01-14 07:11:16 UTC (rev 51)
+++ trunk/debian/rules	2009-06-10 19:10:30 UTC (rev 52)
@@ -25,3 +25,5 @@
 	install -m0755 a2x debian/asciidoc/usr/bin/a2x
 	install -m0755 CHANGELOG debian/asciidoc/usr/share/doc/asciidoc/changelog
 	gzip -9 debian/asciidoc/usr/share/doc/asciidoc/changelog
+	cp -aL examples/website/ debian/asciidoc/usr/share/doc/asciidoc/examples/
+	cp -aL doc/ debian/asciidoc/usr/share/doc/asciidoc/

More information about the Pkg-asciidoc-commits mailing list