[Pkg-haskell-commits] darcs: haskell-leksah-server: Bundle leksah-process in this source package

Joachim Breitner mail at joachim-breitner.de
Sat Jun 12 11:52:57 UTC 2010 

Sat Jun 12 11:08:34 UTC 2010  Joachim Breitner <mail at joachim-breitner.de>
  * Bundle leksah-process in this source package
  Ignore-this: 54b538952ab6e838c3774965cb43c3a8

    A ./README.source
    M ./changelog +1
    M ./control +1
    M ./copyright +35
    A ./patches/
    A ./patches/series
    A ./patches/use_bundled_leksah-process.patch

Sat Jun 12 11:08:34 UTC 2010  Joachim Breitner <mail at joachim-breitner.de>
  * Bundle leksah-process in this source package
  Ignore-this: 54b538952ab6e838c3774965cb43c3a8
diff -rN -u old-haskell-leksah-server/changelog new-haskell-leksah-server/changelog
--- old-haskell-leksah-server/changelog	2010-06-12 11:52:57.618499588 +0000
+++ new-haskell-leksah-server/changelog	2010-06-12 11:52:57.626500015 +0000
@@ -1,5 +1,6 @@
 haskell-leksah-server (0.8.0.6-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #574693)
+  * Bundle leksah-process in this source package
 
  -- Joachim Breitner <nomeata at debian.org>  Sat, 20 Mar 2010 17:18:29 +0100
diff -rN -u old-haskell-leksah-server/control new-haskell-leksah-server/control
--- old-haskell-leksah-server/control	2010-06-12 11:52:57.618499588 +0000
+++ new-haskell-leksah-server/control	2010-06-12 11:52:57.626500015 +0000
@@ -18,6 +18,7 @@
   , libghc6-network-dev (<< 3)
   , libghc6-haddock-dev (>= 2.7.2)
   , libghc6-hslogger-dev (>= 1.0.7)
+  , dpkg (>= 1.14.27)
 Build-Depends-Indep: ghc6-doc
   , libghc6-binary-shared-doc
   , libghc6-mtl-doc
diff -rN -u old-haskell-leksah-server/copyright new-haskell-leksah-server/copyright
--- old-haskell-leksah-server/copyright	2010-06-12 11:52:57.618499588 +0000
+++ new-haskell-leksah-server/copyright	2010-06-12 11:52:57.626500015 +0000
@@ -14,3 +14,38 @@
  On Debian GNU/Linux systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-2'
 
+Files: process-leksah/*
+Copyright: 2004-2008 The University of Glasgow
+           2002 Simon Peyton Jones
+License: The Glasgow Haskell Compiler License
+ Copyright 2002-2009, The University Court of the University of Glasgow.
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ .
+ * Neither name of the University nor the names of its contributors may be
+   used to endorse or promote products derived from this software without
+   specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
+ GLASGOW AND THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
+
+
diff -rN -u old-haskell-leksah-server/patches/series new-haskell-leksah-server/patches/series
--- old-haskell-leksah-server/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-leksah-server/patches/series	2010-06-12 11:52:57.622499801 +0000
@@ -0,0 +1 @@
+use_bundled_leksah-process.patch
diff -rN -u old-haskell-leksah-server/patches/use_bundled_leksah-process.patch new-haskell-leksah-server/patches/use_bundled_leksah-process.patch
--- old-haskell-leksah-server/patches/use_bundled_leksah-process.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-leksah-server/patches/use_bundled_leksah-process.patch	2010-06-12 11:52:57.622499801 +0000
@@ -0,0 +1,64 @@
+Index: haskell-leksah-server-0.8.0.6/leksah-server.cabal
+===================================================================
+--- haskell-leksah-server-0.8.0.6.orig/leksah-server.cabal	2010-06-12 12:58:26.000000000 +0200
++++ haskell-leksah-server-0.8.0.6/leksah-server.cabal	2010-06-12 13:08:21.000000000 +0200
+@@ -31,7 +31,7 @@
+                binary-shared >=0.8, bytestring >=0.9.0.1, containers >=0.2.0.0,
+                directory >=1.0.0.2, filepath >=1.1.0.1, ghc >=6.10.1,
+                ltk >=0.8 && <= 0.9, mtl >=1.1.0.2, parsec >=2.1.0.1,
+-               pretty >=1.0.1.0, process-leksah >=1.0.1.3, time >= 1.1, deepseq >= 1.1,
++               pretty >=1.0.1.0, time >= 1.1, deepseq >= 1.1,
+                hslogger >= 1.0.7, network >= 2.2 && <= 3.0
+     if (impl(ghc >= 6.12))
+        build-depends: haddock >= 2.7.2
+@@ -67,12 +67,24 @@
+        ghc-options: -Wall -ferror-spans -O2
+     ghc-prof-options: -auto-all -prof
+ 
++    -- Bundled leksah-process
++    exposed-modules:
++        IDE.System.Process
++        IDE.System.Process.Internals
++    c-sources:
++        process-leksah/cbits/runProcess.c
++    include-dirs: process-leksah/include
++    includes:
++        runProcess.h
++    cpp-options: -Dbase4
++    hs-source-dirs: process-leksah
++
+ executable leksah-server
+     build-depends: Cabal >=1.6.0.1, base >= 4.0.0.0 && <= 5, binary >=0.5.0.0,
+                binary-shared >=0.8, bytestring >=0.9.0.1, containers >=0.2.0.0,
+                directory >=1.0.0.2, filepath >=1.1.0.1, ghc >=6.10.1,
+                ltk >=0.8 && <= 0.9, mtl >=1.1.0.2, parsec >=2.1.0.1,
+-               pretty >=1.0.1.0, process-leksah >=1.0.1.3, deepseq >= 1.1, network >= 2.2 && <= 3.0
++               pretty >=1.0.1.0, deepseq >= 1.1, network >= 2.2 && <= 3.0
+     if (impl(ghc >= 6.12))
+        build-depends: haddock >= 2.7.2
+     else
+@@ -106,6 +118,13 @@
+        ghc-options: -Wall -ferror-spans -threaded -O2
+     ghc-prof-options: -auto-all -prof
+ 
++    -- Bundled leksah-process
++    c-sources:
++        process-leksah/cbits/runProcess.c
++    include-dirs: process-leksah/include
++    cpp-options: -Dbase4
++    hs-source-dirs: process-leksah
++
+ executable leksahecho
+     main-is: LeksahEcho.hs
+     buildable: True
+@@ -118,4 +137,9 @@
+     else
+        ghc-options: -Wall -ferror-spans -threaded -O2
+ 
+-
++    -- Bundled leksah-process
++    c-sources:
++        process-leksah/cbits/runProcess.c
++    include-dirs: process-leksah/include
++    cpp-options: -Dbase4
++    hs-source-dirs: process-leksah
diff -rN -u old-haskell-leksah-server/README.source new-haskell-leksah-server/README.source
--- old-haskell-leksah-server/README.source	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-leksah-server/README.source	2010-06-12 11:52:57.622499801 +0000
@@ -0,0 +1,8 @@
+leksah needs a modified process library. To avoid packaging it for Debian
+individually, we bundle it in this source package.
+
+pkg-haskell-checkout does not handle that (because uscan does not). To build
+this package, please run:
+wget http://hackage.haskell.org/packages/archive/process-leksah/1.0.1.3/process-leksah-1.0.1.3.tar.gz -O ../haskell-leksah-server_0.8.0.6.orig-process-leksah.tar.gz
+tar xzf ../haskell-leksah-server_0.8.0.6.orig-process-leksah.tar.gz
+mv process-leksah-1.0.1.3 process-leksah

More information about the Pkg-haskell-commits mailing list