[Pkg-haskell-commits] darcs: lhs2tex: Adopt by the Debian Haskell Group

Joachim Breitner mail at joachim-breitner.de
Thu Mar 25 11:22:59 UTC 2010 

Thu Mar 25 11:18:09 UTC 2010  Joachim Breitner <mail at joachim-breitner.de>
  * Adopt by the Debian Haskell Group
  Ignore-this: b785bd58a4fc606c6522b2af5c26bb70

     ./patches/01_always_install_polytable.dpatch -> ./patches/01_always_install_polytable.patch
     ./patches/10_fix_bashims.dpatch -> ./patches/10_fix_bashims.patch
    R ./README.source
    M ./changelog +1
    M ./compat -1 +1
    M ./control -6 +19
    R ./patches/00list
    M ./patches/01_always_install_polytable.patch -3 +4
    M ./patches/10_fix_bashims.patch -6 +8
    M ./rules -3
    A ./source/
    A ./source/format

Thu Mar 25 11:18:09 UTC 2010  Joachim Breitner <mail at joachim-breitner.de>
  * Adopt by the Debian Haskell Group
  Ignore-this: b785bd58a4fc606c6522b2af5c26bb70
diff -rN -u old-lhs2tex/changelog new-lhs2tex/changelog
--- old-lhs2tex/changelog	2010-03-25 11:22:59.162696012 +0000
+++ new-lhs2tex/changelog	2010-03-25 11:22:59.170696434 +0000
@@ -1,6 +1,7 @@
 lhs2tex (1.15-1) UNRELEASED; urgency=low
 
   * New upstream release 
+  * Adopt by the Debian Haskell Group
 
  -- Joachim Breitner <nomeata at debian.org>  Thu, 25 Mar 2010 12:06:24 +0100
 
diff -rN -u old-lhs2tex/compat new-lhs2tex/compat
--- old-lhs2tex/compat	2010-03-25 11:22:59.162696012 +0000
+++ new-lhs2tex/compat	2010-03-25 11:22:59.166696223 +0000
@@ -1 +1 @@
-5
+7
diff -rN -u old-lhs2tex/control new-lhs2tex/control
--- old-lhs2tex/control	2010-03-25 11:22:59.162696012 +0000
+++ new-lhs2tex/control	2010-03-25 11:22:59.170696434 +0000
@@ -1,16 +1,29 @@
 Source: lhs2tex
 Section: text
 Priority: optional
-Maintainer: Arjan Oosting <arjan at debian.org>
-Build-Depends: autotools-dev, debhelper (>= 5.0.0), dpatch, ghc6 (>= 6.8.2), libghc6-regex-compat-dev, libghc6-utf8-string-dev, tex-common 
-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/
+Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
+Uploaders: Arjan Oosting <arjan at debian.org>
+Build-Depends:
+ autotools-dev,
+ debhelper (>= 7),
+ ghc6,
+ libghc6-regex-compat-dev,
+ libghc6-utf8-string-dev,
+ tex-common 
+Standards-Version: 3.8.4
+Vcs-Darcs: http://darcs.debian.org/pkg-haskell/lhs2tex
+Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/lhs2tex
 Homepage: http://www.informatik.uni-bonn.de/~loeh/lhs2tex/
 
 Package: lhs2tex
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, texlive-latex-base, texlive-latex-base, texlive-latex-base, texlive-math-extra
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ texlive-latex-base,
+ texlive-latex-base,
+ texlive-latex-base,
+ texlive-math-extra
 Description: Generates LaTeX code from literate Haskell sources
  lhs2TeX includes the following features:
  .
diff -rN -u old-lhs2tex/patches/00list new-lhs2tex/patches/00list
--- old-lhs2tex/patches/00list	2010-03-25 11:22:59.158695801 +0000
+++ new-lhs2tex/patches/00list	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-01_always_install_polytable
-10_fix_bashims
diff -rN -u old-lhs2tex/patches/01_always_install_polytable.dpatch new-lhs2tex/patches/01_always_install_polytable.dpatch
--- old-lhs2tex/patches/01_always_install_polytable.dpatch	2010-03-25 11:22:59.158695801 +0000
+++ new-lhs2tex/patches/01_always_install_polytable.dpatch	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#! /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@
- 
diff -rN -u old-lhs2tex/patches/01_always_install_polytable.patch new-lhs2tex/patches/01_always_install_polytable.patch
--- old-lhs2tex/patches/01_always_install_polytable.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-lhs2tex/patches/01_always_install_polytable.patch	2010-03-25 11:22:59.166696223 +0000
@@ -0,0 +1,19 @@
+#! /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@
+Index: lhs2tex-1.15/config.mk.in
+===================================================================
+--- lhs2tex-1.15.orig/config.mk.in	2009-12-18 13:21:18.000000000 +0100
++++ lhs2tex-1.15/config.mk.in	2010-03-25 12:16:17.000000000 +0100
+@@ -41,6 +41,6 @@
+ 
+ polydir         = @texmf@/tex/latex/polytable
+ texdir          = @texmf@/tex/latex/lhs2tex
+-INSTALL_POLYTABLE = @POLYTABLE_INSTALL@
++INSTALL_POLYTABLE = yes
+ MKTEXLSR        = @MKTEXLSR@
+ 
diff -rN -u old-lhs2tex/patches/10_fix_bashims.dpatch new-lhs2tex/patches/10_fix_bashims.dpatch
--- old-lhs2tex/patches/10_fix_bashims.dpatch	2010-03-25 11:22:59.158695801 +0000
+++ new-lhs2tex/patches/10_fix_bashims.dpatch	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-#! /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
diff -rN -u old-lhs2tex/patches/10_fix_bashims.patch new-lhs2tex/patches/10_fix_bashims.patch
--- old-lhs2tex/patches/10_fix_bashims.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-lhs2tex/patches/10_fix_bashims.patch	2010-03-25 11:22:59.166696223 +0000
@@ -0,0 +1,33 @@
+#! /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@
+Index: lhs2tex-1.15/Examples/lhs2TeXpre
+===================================================================
+--- lhs2tex-1.15.orig/Examples/lhs2TeXpre	2009-12-18 13:21:18.000000000 +0100
++++ lhs2tex-1.15/Examples/lhs2TeXpre	2010-03-25 12:16:23.000000000 +0100
+@@ -5,7 +5,7 @@
+ 
+ LHSHOME=..
+ 
+-if [ "$1" == "$2" ]; then
++if [ "$1" = "$2" ]; then
+   cp "$2" "$3"
+ else
+   if grep -q "^%include" "$1"; then
+Index: lhs2tex-1.15/doc/lhs2TeXpre
+===================================================================
+--- lhs2tex-1.15.orig/doc/lhs2TeXpre	2009-12-18 13:21:18.000000000 +0100
++++ lhs2tex-1.15/doc/lhs2TeXpre	2010-03-25 12:16:23.000000000 +0100
+@@ -5,7 +5,7 @@
+ 
+ LHSHOME=..
+ 
+-if [ "$1" == "$2" ]; then
++if [ "$1" = "$2" ]; then
+   cp "$2" "$3"
+ else
+   if grep -q "^%include" "$1"; then
diff -rN -u old-lhs2tex/README.source new-lhs2tex/README.source
--- old-lhs2tex/README.source	2010-03-25 11:22:59.162696012 +0000
+++ new-lhs2tex/README.source	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-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.
diff -rN -u old-lhs2tex/rules new-lhs2tex/rules
--- old-lhs2tex/rules	2010-03-25 11:22:59.158695801 +0000
+++ new-lhs2tex/rules	2010-03-25 11:22:59.170696434 +0000
@@ -9,9 +9,6 @@
 # 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)
 export DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
diff -rN -u old-lhs2tex/source/format new-lhs2tex/source/format
--- old-lhs2tex/source/format	1970-01-01 00:00:00.000000000 +0000
+++ new-lhs2tex/source/format	2010-03-25 11:22:59.162696012 +0000
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the Pkg-haskell-commits mailing list