[SCM] mathpartir packaging branch, master, updated. upstream/1.1.1-10-g7754caa

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 12c9ff8e2e3d8cc9f9bce64e72d5869a05043cfb
Author: Ralf Treinen <treinen at debian.org>
Date:   Tue Nov 24 23:20:55 2009 +0100

    Imported Debian patch 1.2.0-3

diff --git a/debian/changelog b/debian/changelog
index a0bea5a..cd94f34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+mathpartir (1.2.0-3) unstable; urgency=low
+
+  * Convert to source-format 3.0 (quilt)
+    - debian/patches quilt style
+    - drop build-dependency on dpatch
+    - no more patching in debian/rules
+  * Standards-version 3.8.3 (no change)
+  * Debhelper compatibility level 7
+  * Fixed typo in long package descripion (closes: #557686)
+  * debian/rules: "dh_clean -k" => "dh_prep"
+  * debian/copyright: point to versionend GPL-2 file
+  * changed doc-base section to typesetting
+
+ -- Ralf Treinen <treinen at debian.org>  Tue, 24 Nov 2009 23:20:55 +0100
+
 mathpartir (1.2.0-2) unstable; urgency=low
 
   * Removed bashism in debian/rules (closes: Bug#484405).
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 3b4d03d..e2ba437 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,16 @@ Source: mathpartir
 Section: tex
 Priority: optional
 Maintainer: Ralf Treinen <treinen at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, tex-common
+Build-Depends: debhelper (>= 7.0), tex-common
 Build-Depends-Indep: hevea
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Homepage: http://pauillac.inria.fr/~remy/latex/index.html#mathpartir
 
 Package: mathpartir
 Architecture: all
 Depends: ${misc:Depends}, texlive-latex-base 
 Description: LaTeX macros for typesetting inference rules
- This packages contains LaTeX macros for
+ This package contains LaTeX macros for
   * typesetting a sequence of math formulas in mixed horizontal and vertical
     mode
   * typesetting inference rules
diff --git a/debian/copyright b/debian/copyright
index 427e17c..053aa70 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,6 +8,7 @@ Copyright: 2001, 2002, 2003, 2004, 2005 Didier Rémy
 Upstream Author: Didier Remy <Didier.Remy at inria.fr>
 
 License: You are free to distribute this software under the terms of
-the GNU General Public License, version 2.  On Debian systems, the
-complete text of the GNU General Public License can be found in the
-/usr/share/common-licenses/GPL file.
+the GNU General Public License; version 2, or (at your option) any
+later version.  On Debian systems, the complete text of the GNU
+General Public License version 2 can be found in the
+/usr/share/common-licenses/GPL-2 file.
diff --git a/debian/mathpartir.doc-base b/debian/mathpartir.doc-base
index f61d771..a070500 100644
--- a/debian/mathpartir.doc-base
+++ b/debian/mathpartir.doc-base
@@ -2,7 +2,7 @@ Document: mathpartir
 Title: Mathpartir Manual
 Author: Didier Remy
 Abstract: This manual describes the mathpartir LaTeX macros and how they can be used to typeset mathematical formulas and inference rules.
-Section: tex
+Section: Typesetting
 
 Format: HTML
 Index: /usr/share/doc/mathpartir/mathpartir.html
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d1cb042..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01doc-hevea
diff --git a/debian/patches/01doc-hevea.dpatch b/debian/patches/doc-hevea
similarity index 67%
rename from debian/patches/01doc-hevea.dpatch
rename to debian/patches/doc-hevea
index d2aa359..0e87e0a 100644
--- a/debian/patches/01doc-hevea.dpatch
+++ b/debian/patches/doc-hevea
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01doc-hevea.dpatch by Ralf Treinen <treinen at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mathpartir-1.2~/mathpartir.tex mathpartir-1.2/mathpartir.tex
+Author: Ralf Treinen <treinen at debian.org>
+Description: Adding warning of the non-accuracy of the HTML documentation
+`
 --- mathpartir-1.2~/mathpartir.tex	2007-03-13 21:50:08.000000000 +0100
 +++ mathpartir-1.2/mathpartir.tex	2007-03-13 21:57:11.000000000 +0100
 @@ -78,6 +78,15 @@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3ac9882
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+doc-hevea
diff --git a/debian/rules b/debian/rules
index f4a1404..147a2d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +2,14 @@
 # debian/rules for mathpartir
 
 #export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+
 INST=debian/mathpartir
 
-build: patch
+build:
 	dh_testdir
 	hevea -fix mathpartir.tex
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	dh_clean 
@@ -18,7 +18,7 @@ clean: unpatch
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep 
 	dh_installdirs
 	cp mathpartir.sty $(INST)/usr/share/texmf/tex/latex/mathpartir
 	cp mathpartir.tex $(INST)/usr/share/doc/texmf/latex/mathpartir
@@ -42,4 +42,4 @@ binary-indep: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
mathpartir packaging