[Pkg-haskell-commits] r1246 - in /packages/lhs2tex/trunk: config.mk.in debian/README.source debian/changelog debian/control debian/patches/ debian/patches/00list debian/patches/01_always_install_polytable.dpatch debian/patches/10_fix_bashims.dpatch debian/rules

arjan at users.alioth.debian.org arjan at users.alioth.debian.org
Sun Jul 20 09:53:51 UTC 2008 

Author: arjan
Date: Sun Jul 20 09:53:51 2008
New Revision: 1246

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1246
Log:
 r229 at reddwarf:  arjan | 2008-07-20 11:15:36 +0200
 * debian/control:
   - Add dpatch to the build dependencies.
   - Bump Standards-Version to 3.8.0
 * debian/patches/01_always_install_polytable.dpatch:
   - Patch config.mk.in to make sure we install the polytable (La)Tex 
     style.
 * debian/patches/10_fix_bashims.dpatch:
   - Fix a bashism in the examples of lhs2TeX (Closes: #489624)
 * debian/README.source: Added.
 * debian/rules:
   - Include dpatch snippet
   - Remove the sed expressions which is replaced with a regular patch

Added:
    packages/lhs2tex/trunk/debian/README.source
    packages/lhs2tex/trunk/debian/patches/
    packages/lhs2tex/trunk/debian/patches/00list
    packages/lhs2tex/trunk/debian/patches/01_always_install_polytable.dpatch   (with props)
    packages/lhs2tex/trunk/debian/patches/10_fix_bashims.dpatch   (with props)
Modified:
    packages/lhs2tex/trunk/config.mk.in
    packages/lhs2tex/trunk/debian/changelog
    packages/lhs2tex/trunk/debian/control
    packages/lhs2tex/trunk/debian/rules

Modified: packages/lhs2tex/trunk/config.mk.in
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/lhs2tex/trunk/config.mk.in?rev=1246&op=diff
==============================================================================
--- packages/lhs2tex/trunk/config.mk.in (original)
+++ packages/lhs2tex/trunk/config.mk.in Sun Jul 20 09:53:51 2008
@@ -41,6 +41,6 @@
 
 polydir         = @texmf@/tex/latex/polytable
 texdir          = @texmf@/tex/latex/lhs2tex
-INSTALL_POLYTABLE = yes
+INSTALL_POLYTABLE = @POLYTABLE_INSTALL@
 MKTEXLSR        = @MKTEXLSR@
 

Added: packages/lhs2tex/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/lhs2tex/trunk/debian/README.source?rev=1246&op=file
==============================================================================
--- packages/lhs2tex/trunk/debian/README.source (added)
+++ packages/lhs2tex/trunk/debian/README.source Sun Jul 20 09:53:51 2008
@@ -1,0 +1,11 @@
+The used patch system is dpatch.
+
+To patch the source run "debian/rules patch"
+
+To add a new patch:
+* put it under debian/patches
+* add it to debian/patches/00list
+
+To unpatch the source run "debian/rules unpatch" 
+ 
+See /usr/share/doc/dpatch for more information.

Modified: packages/lhs2tex/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/lhs2tex/trunk/debian/changelog?rev=1246&op=diff
==============================================================================
--- packages/lhs2tex/trunk/debian/changelog (original)
+++ packages/lhs2tex/trunk/debian/changelog Sun Jul 20 09:53:51 2008
@@ -1,3 +1,20 @@
+lhs2tex (1.13-3~pre1) unstable; urgency=low
+
+  * debian/control:
+    - Add dpatch to the build dependencies.
+    - Bump Standards-Version to 3.8.0
+  * debian/patches/01_always_install_polytable.dpatch:
+    - Patch config.mk.in to make sure we install the polytable (La)Tex 
+      style.
+  * debian/patches/10_fix_bashims.dpatch:
+    - Fix a bashism in the examples of lhs2TeX (Closes: #489624)
+  * debian/README.source: Added.
+  * debian/rules:
+    - Include dpatch snippet
+    - Remove the sed expressions which is replaced with a regular patch
+
+ -- Arjan Oosting <arjan at debian.org>  Sun, 20 Jul 2008 10:46:43 +0200
+
 lhs2tex (1.13-2) unstable; urgency=low
 
   * Fix bashism in debian/rules. (Closes: #484397)

Modified: packages/lhs2tex/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/lhs2tex/trunk/debian/control?rev=1246&op=diff
==============================================================================
--- packages/lhs2tex/trunk/debian/control (original)
+++ packages/lhs2tex/trunk/debian/control Sun Jul 20 09:53:51 2008
@@ -2,8 +2,8 @@
 Section: text
 Priority: optional
 Maintainer: Arjan Oosting <arjan at debian.org>
-Build-Depends: autotools-dev, debhelper (>= 5.0.0), ghc6 (>= 6.8.2), libghc6-regex-compat-dev 
-Standards-Version: 3.7.3
+Build-Depends: autotools-dev, debhelper (>= 5.0.0), dpatch, ghc6 (>= 6.8.2), libghc6-regex-compat-dev 
+Standards-Version: 3.8.0
 Vcs-Svn: https://moonshine.dnsalias.org/svn/arjan-public/debian/lhs2tex/trunk
 Vcs-Browser: https://moonshine.dnsalias.org/wsvn/arjan-public/debian/lhs2tex/trunk/
 Homepage: http://www.informatik.uni-bonn.de/~loeh/lhs2tex/

Added: packages/lhs2tex/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/lhs2tex/trunk/debian/patches/00list?rev=1246&op=file
==============================================================================
--- packages/lhs2tex/trunk/debian/patches/00list (added)
+++ packages/lhs2tex/trunk/debian/patches/00list Sun Jul 20 09:53:51 2008
@@ -1,0 +1,2 @@
+01_always_install_polytable
+10_fix_bashims

Added: packages/lhs2tex/trunk/debian/patches/01_always_install_polytable.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/lhs2tex/trunk/debian/patches/01_always_install_polytable.dpatch?rev=1246&op=file
==============================================================================
--- packages/lhs2tex/trunk/debian/patches/01_always_install_polytable.dpatch (added)
+++ packages/lhs2tex/trunk/debian/patches/01_always_install_polytable.dpatch Sun Jul 20 09:53:51 2008
@@ -1,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_always_install_polytable.dpatch by Arjan Oosting <arjan at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: make sure we alway include polytable in the Debian package.
+
+ at DPATCH@
+diff -urNad lhs2tex~/config.mk.in lhs2tex/config.mk.in
+--- lhs2tex~/config.mk.in	2008-07-20 11:08:24.000000000 +0200
++++ lhs2tex/config.mk.in	2008-07-20 11:09:32.000000000 +0200
+@@ -41,6 +41,6 @@
+ 
+ polydir         = @texmf@/tex/latex/polytable
+ texdir          = @texmf@/tex/latex/lhs2tex
+-INSTALL_POLYTABLE = @POLYTABLE_INSTALL@
++INSTALL_POLYTABLE = yes
+ MKTEXLSR        = @MKTEXLSR@
+ 

Propchange: packages/lhs2tex/trunk/debian/patches/01_always_install_polytable.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/lhs2tex/trunk/debian/patches/10_fix_bashims.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/lhs2tex/trunk/debian/patches/10_fix_bashims.dpatch?rev=1246&op=file
==============================================================================
--- packages/lhs2tex/trunk/debian/patches/10_fix_bashims.dpatch (added)
+++ packages/lhs2tex/trunk/debian/patches/10_fix_bashims.dpatch Sun Jul 20 09:53:51 2008
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix_bashims.dpatch by Arjan Oosting <arjan at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix a bashism in the examples of lhs2TeX
+
+ at DPATCH@
+diff -urNad lhs2tex~/Examples/lhs2TeXpre lhs2tex/Examples/lhs2TeXpre
+--- lhs2tex~/Examples/lhs2TeXpre	2008-03-22 21:29:39.000000000 +0100
++++ lhs2tex/Examples/lhs2TeXpre	2008-07-20 10:52:16.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ LHSHOME=..
+ 
+-if [ "$1" == "$2" ]; then
++if [ "$1" = "$2" ]; then
+   cp "$2" "$3"
+ else
+   if grep -q "^%include" "$1"; then
+diff -urNad lhs2tex~/doc/lhs2TeXpre lhs2tex/doc/lhs2TeXpre
+--- lhs2tex~/doc/lhs2TeXpre	2008-03-22 21:29:39.000000000 +0100
++++ lhs2tex/doc/lhs2TeXpre	2008-07-20 10:53:47.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ LHSHOME=..
+ 
+-if [ "$1" == "$2" ]; then
++if [ "$1" = "$2" ]; then
+   cp "$2" "$3"
+ else
+   if grep -q "^%include" "$1"; then

Propchange: packages/lhs2tex/trunk/debian/patches/10_fix_bashims.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/lhs2tex/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/lhs2tex/trunk/debian/rules?rev=1246&op=diff
==============================================================================
--- packages/lhs2tex/trunk/debian/rules (original)
+++ packages/lhs2tex/trunk/debian/rules Sun Jul 20 09:53:51 2008
@@ -9,6 +9,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Include dpatch
+include /usr/share/dpatch/dpatch.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -33,8 +35,6 @@
 	dh_testdir
 	cp -f /usr/share/misc/config.sub config.sub 
 	cp -f /usr/share/misc/config.guess config.guess
-	# make sure we alway include polytable in the Debian package.
-	sed -i -e "s|@POLYTABLE_INSTALL@|yes|" config.mk.in
 	# Don't rebuild the guide as ghci does not work on all architectures..
 	# rm -f doc/Guide2.dontbuild
 	./configure $(CONFIGURE_FLAGS) --prefix=/usr --mandir=\$${prefix}/share/man --with-texmf=/usr/share/texmf --enable-polytable

More information about the Pkg-haskell-commits mailing list