[Pkg-asciidoc-commits] r79 - trunk/debian

[Alexander Wirt]

Author: formorer
Date: 2010-11-28 11:42:37 +0000 (Sun, 28 Nov 2010)
New Revision: 79

Added:
   trunk/debian/asciidoc.doc
   trunk/debian/asciidoc.examples
Modified:
   trunk/debian/asciidoc.links
   trunk/debian/asciidoc.manpages
   trunk/debian/control
   trunk/debian/rules
Log:
Rework packaging and use dh instead of cdbs


Added: trunk/debian/asciidoc.doc
===================================================================
--- trunk/debian/asciidoc.doc	                        (rev 0)
+++ trunk/debian/asciidoc.doc	2010-11-28 11:42:37 UTC (rev 79)
@@ -0,0 +1 @@
+CHANGELOG

Added: trunk/debian/asciidoc.examples
===================================================================
--- trunk/debian/asciidoc.examples	                        (rev 0)
+++ trunk/debian/asciidoc.examples	2010-11-28 11:42:37 UTC (rev 79)
@@ -0,0 +1 @@
+examples/website/

Modified: trunk/debian/asciidoc.links
===================================================================
--- trunk/debian/asciidoc.links	2010-11-28 08:34:20 UTC (rev 78)
+++ trunk/debian/asciidoc.links	2010-11-28 11:42:37 UTC (rev 79)
@@ -1,4 +1,3 @@
 /etc/asciidoc/stylesheets/docbook-xsl.css /usr/share/doc/asciidoc/docbook-xsl.css
-etc/asciidoc/stylesheets usr/share/asciidoc/stylesheets
 usr/share/asciidoc/images etc/asciidoc/images
 usr/share/asciidoc/javascripts /etc/asciidoc/javascripts

Modified: trunk/debian/asciidoc.manpages
===================================================================
--- trunk/debian/asciidoc.manpages	2010-11-28 08:34:20 UTC (rev 78)
+++ trunk/debian/asciidoc.manpages	2010-11-28 11:42:37 UTC (rev 79)
@@ -1,2 +1,2 @@
-debian/asciidoc.1
-debian/a2x.1
+doc/asciidoc.1
+doc/a2x.1

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2010-11-28 08:34:20 UTC (rev 78)
+++ trunk/debian/control	2010-11-28 11:42:37 UTC (rev 79)
@@ -3,8 +3,8 @@
 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 (>= 5) 
-Build-Depends-Indep: xmlto, python (>= 2.3), dpatch
+Build-Depends: debhelper (>= 7.0.50), dpatch 
+Build-Depends-Indep: xmlto, python (>= 2.3)
 Standards-Version: 3.9.1
 
 Package: asciidoc

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2010-11-28 08:34:20 UTC (rev 78)
+++ trunk/debian/rules	2010-11-28 11:42:37 UTC (rev 79)
@@ -1,30 +1,45 @@
 #!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
-# Written by Fredrik K. Steen tis 2005-03-01 08:18:22
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/dpatch/dpatch.make
 
-build/asciidoc::
-	./asciidoc.py -d manpage -b docbook -o debian/a2x.1.xml doc/a2x.1.txt
-	./asciidoc.py -d manpage -b docbook -o debian/asciidoc.1.xml doc/asciidoc.1.txt
-	/usr/bin/xmlto -o debian/ man debian/a2x.1.xml
-	/usr/bin/xmlto -o debian/ man debian/asciidoc.1.xml
+export DH_VERBOSE=1
 
-cleanbuilddir/asciidoc::
-	rm -f debian/asciidoc.1.xml
-	rm -f debian/asciidoc.1
-	rm -f debian/a2x.1.xml
-	rm -f debian/a2x.1
 
-binary-post-install/asciidoc::
-	install -m0755 asciidoc.py debian/asciidoc/usr/bin/asciidoc
-	install -m0755 a2x.py debian/asciidoc/usr/bin/a2x
+
+build: patch-stamp
+
+clean: unpatch
+	-rm config.log
+	-rm Makefile
+	-rm config.status
+	-rm debian/asciidoc.1.xml
+	-rm doc/asciidoc.1
+	-rm debian/a2x.1.xml
+	-rm doc/a2x.1
+	dh clean
+
+override_dh_install:
+	dh_install
+	rm debian/asciidoc/usr/bin/a2x
+	mv debian/asciidoc/usr/bin/a2x.py debian/asciidoc/usr/bin/a2x
+	rm debian/asciidoc/usr/bin/asciidoc
+	mv debian/asciidoc/usr/bin/asciidoc.py debian/asciidoc/usr/bin/asciidoc
 	install -m0755 tests/testasciidoc.py debian/asciidoc/usr/bin/testasciidoc
-	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/
+
+override_dh_link:
+	rm -rf debian/asciidoc/etc/asciidoc/javascripts
+	rm -rf debian/asciidoc/etc/asciidoc/icons
+	rm -rf debian/asciidoc/etc/asciidoc/images
+	dh_link
+
+
+%:
+	dh $@