[Pkg-haskell-commits] r927 - in /packages/haskell-edison/trunk/debian: changelog control patches/00list patches/01_update-cabal-file.dpatch patches/20_add-haddock-file.dpatch rules
arjan at users.alioth.debian.org
arjan at users.alioth.debian.org
Sun Jan 13 00:57:39 UTC 2008
Author: arjan
Date: Sun Jan 13 00:57:39 2008
New Revision: 927
URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=927
Log:
r2380 at nebula: arjan | 2008-01-13 01:55:26 +0100
* Update for GHC 6.8.2:
- debian/patches/01_update-cabal-file.dpatch:
+ Add array and containers to the Build-Depends which are libraries
which are split of the base library.
+ Add FlexibleInstances, TypeSynonymInstances PatternSignatures and
FlexibleContexts as needed Extensions.
+ Add -fglashow-exts to the Ghc-Options so GHC will parse
unsafeCoerce# properly.
- debian/patches/20_add-haddock-file.dpatch: Updated.
- debian/rules:
+ The location of the package specification file has changes, so
adjust the debian/rules file for that.
+ Add a link to the COPYRIGHT file in de edison-api and edison-core
directories as the new Cabal version tries to install it and fails
if it is missing.
+ Remove these links on clean.
+ Remove the installed COPYRIGHT files. No need to duplicate this
information in the packages.
- Drop dctrl-tools from the build dependencies as the script using it
is removed.
- Add haskell-devscripts (>= 0.6.0) to the build dependencies because
we user dh_haskell_depends.
- Change the sections of the libghc-*-dev packages to libdevel to fix
lintian warning "dev-package-should-be-section-libdevel".
* debian/rules:
- Replace call to debian/mk-haskell-depends script with call to
dh_haskell_depends from haskell-devscripts.
Added:
packages/haskell-edison/trunk/debian/patches/01_update-cabal-file.dpatch (with props)
Modified:
packages/haskell-edison/trunk/debian/changelog
packages/haskell-edison/trunk/debian/control
packages/haskell-edison/trunk/debian/patches/00list
packages/haskell-edison/trunk/debian/patches/20_add-haddock-file.dpatch
packages/haskell-edison/trunk/debian/rules
Modified: packages/haskell-edison/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-edison/trunk/debian/changelog?rev=927&op=diff
==============================================================================
--- packages/haskell-edison/trunk/debian/changelog (original)
+++ packages/haskell-edison/trunk/debian/changelog Sun Jan 13 00:57:39 2008
@@ -1,10 +1,37 @@
haskell-edison (1.2.1-6~pre1) unstable; urgency=low
+ * Update for GHC 6.8.2:
+ - debian/patches/01_update-cabal-file.dpatch:
+ + Add array and containers to the Build-Depends which are libraries
+ which are split of the base library.
+ + Add FlexibleInstances, TypeSynonymInstances PatternSignatures and
+ FlexibleContexts as needed Extensions.
+ + Add -fglashow-exts to the Ghc-Options so GHC will parse
+ unsafeCoerce# properly.
+ - debian/patches/20_add-haddock-file.dpatch: Updated.
+ - debian/rules:
+ + The location of the package specification file has changes, so
+ adjust the debian/rules file for that.
+ + Add a link to the COPYRIGHT file in de edison-api and edison-core
+ directories as the new Cabal version tries to install it and fails
+ if it is missing.
+ + Remove these links on clean.
+ + Remove the installed COPYRIGHT files. No need to duplicate this
+ information in the packages.
* debian/control:
- Replace Xs-Vcs-* fields with new official Vcs-* fields.
- Bump Standards-Version to 3.7.3. No changes needed.
+ - Drop dctrl-tools from the build dependencies as the script using it
+ is removed.
+ - Add haskell-devscripts (>= 0.6.0) to the build dependencies because
+ we user dh_haskell_depends.
+ - Change the sections of the libghc-*-dev packages to libdevel to fix
+ lintian warning "dev-package-should-be-section-libdevel".
+ * debian/rules:
+ - Replace call to debian/mk-haskell-depends script with call to
+ dh_haskell_depends from haskell-devscripts.
- -- Arjan Oosting <arjan at debian.org> Tue, 08 Jan 2008 07:16:23 +0100
+ -- Arjan Oosting <arjan at debian.org> Sun, 13 Jan 2008 00:05:58 +0100
haskell-edison (1.2.1-5) unstable; urgency=high
Modified: packages/haskell-edison/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-edison/trunk/debian/control?rev=927&op=diff
==============================================================================
--- packages/haskell-edison/trunk/debian/control (original)
+++ packages/haskell-edison/trunk/debian/control Sun Jan 13 00:57:39 2008
@@ -2,9 +2,10 @@
Section: devel
Priority: optional
Maintainer: Arjan Oosting <arjan at debian.org>
-Build-Depends: dctrl-tools, debhelper (>= 5), dpatch, dpkg-dev (>= 1.13.19),
- ghc6 (>= 6.6), ghc6-prof (>= 6.6), libghc6-mtl-dev, libghc6-mtl-prof,
- libghc6-quickcheck-dev, libghc6-quickcheck-prof
+Build-Depends: debhelper (>= 5), dpatch, dpkg-dev (>= 1.13.19),
+ ghc6 (>= 6.6), ghc6-prof (>= 6.6), haskell-devscripts (>= 0.6.0),
+ libghc6-mtl-dev, libghc6-mtl-prof, libghc6-quickcheck-dev,
+ libghc6-quickcheck-prof
Build-Depends-Indep: cpphs, haddock, hugs (>= 98.200503.08),
libhugs-mtl | hugs (<< 98.200609.21), libhugs-quickcheck | hugs (<< 98.200609.21),
libghc6-base-doc, libghc6-haskell98-doc, libghc6-mtl-doc, libghc6-quickcheck-doc
@@ -15,6 +16,7 @@
Package: libghc6-edison-api-dev
Architecture: any
+Section: libdevel
Depends: ${haskell:Depends}, ${misc:Depends}
Recommends: libghc6-edison-core-dev (= ${binary:Version})
Suggests: haskell-edison-doc (= ${source:Version})
@@ -35,6 +37,7 @@
Package: libghc6-edison-core-dev
Architecture: any
+Section: libdevel
Depends: libghc6-edison-api-dev (= ${binary:Version}),
${haskell:Depends}, ${misc:Depends}
Suggests: haskell-edison-doc (= ${source:Version})
Modified: packages/haskell-edison/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-edison/trunk/debian/patches/00list?rev=927&op=diff
==============================================================================
--- packages/haskell-edison/trunk/debian/patches/00list (original)
+++ packages/haskell-edison/trunk/debian/patches/00list Sun Jan 13 00:57:39 2008
@@ -1,1 +1,2 @@
+01_update-cabal-file
20_add-haddock-file
Added: packages/haskell-edison/trunk/debian/patches/01_update-cabal-file.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-edison/trunk/debian/patches/01_update-cabal-file.dpatch?rev=927&op=file
==============================================================================
--- packages/haskell-edison/trunk/debian/patches/01_update-cabal-file.dpatch (added)
+++ packages/haskell-edison/trunk/debian/patches/01_update-cabal-file.dpatch Sun Jan 13 00:57:39 2008
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_update-cabal-file.dpatch by Arjan Oosting <arjan at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad haskell-edison~/edison-core/EdisonCore.cabal haskell-edison/edison-core/EdisonCore.cabal
+--- haskell-edison~/edison-core/EdisonCore.cabal 2008-01-13 00:04:08.000000000 +0100
++++ haskell-edison/edison-core/EdisonCore.cabal 2008-01-13 00:04:51.000000000 +0100
+@@ -36,7 +36,9 @@
+ Data.Edison.Seq.SimpleQueue
+ Data.Edison.Seq.SizedSeq
+ Build-Depends:
++ array,
+ base >= 1.0,
++ containers,
+ haskell98 >= 1.0,
+ mtl >= 1.0,
+ QuickCheck >= 1.0,
+@@ -46,4 +48,8 @@
+ FunctionalDependencies
+ UndecidableInstances
+ CPP
+-Ghc-Options: -funbox-strict-fields -fwarn-incomplete-patterns -O2
++ FlexibleInstances
++ TypeSynonymInstances
++ PatternSignatures
++ FlexibleContexts
++Ghc-Options: -fglasgow-exts -funbox-strict-fields -fwarn-incomplete-patterns -O2
Propchange: packages/haskell-edison/trunk/debian/patches/01_update-cabal-file.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/haskell-edison/trunk/debian/patches/20_add-haddock-file.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-edison/trunk/debian/patches/20_add-haddock-file.dpatch?rev=927&op=diff
==============================================================================
--- packages/haskell-edison/trunk/debian/patches/20_add-haddock-file.dpatch (original)
+++ packages/haskell-edison/trunk/debian/patches/20_add-haddock-file.dpatch Sun Jan 13 00:57:39 2008
@@ -6,14 +6,14 @@
@DPATCH@
diff -urNad haskell-edison~/Makefile haskell-edison/Makefile
---- haskell-edison~/Makefile 2007-05-28 02:29:54.000000000 +0200
-+++ haskell-edison/Makefile 2007-05-28 02:31:29.000000000 +0200
+--- haskell-edison~/Makefile 2008-01-13 00:56:09.000000000 +0100
++++ haskell-edison/Makefile 2008-01-13 00:58:28.000000000 +0100
@@ -101,7 +101,7 @@
mkdir -p dist/doc/html
mkdir -p dist/doc/tmp
find edison-api/src edison-core/src -name '*.hs' -or -name '*.lhs' | sed 's/[^\/]*\/\(.*\)\/\(.*\)$$/mkdir -p dist\/doc\/tmp\/\1; cpphs -D__HADDOCK__ --noline -Odist\/doc\/tmp\/\1\/\2 &/ ' | sh
- find dist/doc/tmp -type f | xargs haddock -o dist/doc/html -h -t Edison-$(VERSION)
-+ find dist/doc/tmp -type f | xargs haddock -o dist/doc/html -h -t Edison-$(VERSION) --use-package=base --use-package=haskell98 --read-interface=/usr/share/doc/ghc6-doc/html/libraries/mtl/mtl.haddock --read-interface=/usr/share/doc/ghc6-doc/html/libraries/quickcheck/QuickCheck.haddock -D dist/doc/html/Edison.haddock
++ find dist/doc/tmp -type f | xargs haddock -o dist/doc/html -h -t Edison-$(VERSION) --use-package=array --use-package=base --use-package=containers --use-package=haskell98 --use-package=mtl --use-package=QuickCheck -D dist/doc/html/Edison.haddock
tarball : docs
darcs dist -d edison-$(VERSION)-source
Modified: packages/haskell-edison/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-edison/trunk/debian/rules?rev=927&op=diff
==============================================================================
--- packages/haskell-edison/trunk/debian/rules (original)
+++ packages/haskell-edison/trunk/debian/rules Sun Jan 13 00:57:39 2008
@@ -56,6 +56,7 @@
chmod 755 debian/ghc6 debian/ghc-pkg6
for d in $(EDISON_DIRS) ; do \
cd "$(CURDIR)/$$d" && \
+ ln -s ../COPYRIGHT && \
"$(CURDIR)/debian/ghc6" --make Setup.hs -o setup -package Cabal && \
name=`grep "Name:" *.cabal | sed "s|Name:[ \t]*\(.*\)|\1|"` && \
vers=`grep "Version:" *.cabal | sed "s|Version:[ \t]*\(.*\)|\1|"` && \
@@ -75,6 +76,7 @@
rm -f configure-stamp build-arch-stamp build-indep-stamp
for d in $(EDISON_DIRS) ; do \
cd "$(CURDIR)/$$d" && \
+ rm -f COPYRIGHT && \
if [ -x setup ] && [ -e .setup-config ]; then ./setup clean ; fi && \
rm -rf setup Setup.hi Setup.ho Setup.o .*config* dist html register.sh && \
rm -f "$(CURDIR)/debian/libghc6-$$d-dev.postinst" && \
@@ -120,8 +122,9 @@
sed -e "s%haddock-interfaces:.*%haddock-interfaces: /usr/share/doc/haskell-edison-doc/html/Edison.haddock%" \
-e "s%haddock-html: .*%haddock-html: /usr/share/doc/haskell-edison-doc/html%" \
-e "s%include-dirs: .*%include-dirs:%" \
- "$(CURDIR)/$$d/.installed-pkg-config" > "$$libdir/installed-pkg-config" ; \
+ "$(CURDIR)/$$d/dist/installed-pkg-config" > "$$libdir/installed-pkg-config" ; \
done && \
+ rm -rf $(CURDIR)/debian/libghc6-$$d-dev/usr/lib/haskell-packages/ghc6/share/doc/ && \
find "$(CURDIR)/debian/libghc6-$$d-dev/usr/lib/haskell-packages/" -empty -type d -delete ; \
done
dh_install -s
@@ -141,7 +144,8 @@
./setup build && \
./setup copy --destdir="$(CURDIR)/debian/libhugs-$$d" && \
install --mode=644 -D "$(CURDIR)/debian/libhugs.linda-overrides" \
- "$(CURDIR)/debian/libhugs-$$d/usr/share/linda/overrides/libhugs-$$d" ; \
+ "$(CURDIR)/debian/libhugs-$$d/usr/share/linda/overrides/libhugs-$$d" && \
+ rm -rf $(CURDIR)/debian/libhugs-$$d/usr/share/doc/ ; \
done
dh_install -i
@@ -159,7 +163,7 @@
dh_compress -X.haddock
dh_fixperms
dh_installdeb
- sh -e debian/mk-haskell-depends -XEdisonAPI-1.2.1
+ dh_haskell_depends -XEdisonAPI-1.2.1
dh_shlibdeps
dh_gencontrol
dh_md5sums
More information about the Pkg-haskell-commits
mailing list