[Pkg-haskell-commits] r1093 - in /packages/hat/trunk: debian/ debian/patches/ src/hattools/
arjan at users.alioth.debian.org
arjan at users.alioth.debian.org
Sun Feb 17 03:53:19 UTC 2008
Author: arjan
Date: Sun Feb 17 03:53:19 2008
New Revision: 1093
URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1093
Log:
r2669 at nebula: arjan | 2008-02-17 04:50:57 +0100
* Set urgency to high as this upload fixes an RC bug.
* Update for GHC 6.8.2 (Closes: #462439):
- debian/control:
+ Bump build dependency on hmake to >= 3.13 which will work with
GHC 6.8.2
+ Add libghc6-parsec-dev and libghc6-parsec-prof to the build
dependencies
- debian/patches/15_add-missing-packages.dpatch: Added. The base
package has been split into several packages, so adjust the build
system for that.
* debian/control:
- Replace the build dependency on libglib1.2-dev with libglib2.0-dev.
- Replace Xs-Vcs-* fields with the now official Vcs-* fields.
- Add a Homepage field.
- Adjust the section of libghc6-hat-dev to libdevel to make lintian
happy (dev-package-should-be-section-libdevel)
- Bump Standards-Version to 3.6.3. No changes needed.
* debian/copyright:
- Fix lintian warning copyright-without-copyright-notice by
replacing copyright with Copyright and (c) with ©.
* debian/rules:
- Remove generated file src/hattools/checkglib.h on clean.
- Add '-optl -Wl,--as-needed' to the BUILDOPTS to unnecessary linkages
introduced by the build system.
* debian/patches/14_fix-manpage.dpatch:
- Updated to fix man/hat-cover.1 as well.
* debian/patches/19_glib2.0.dpatch:
- Added. Build against glib-2.0 instead of glib-1.2.
* debian/patches/20_install-all-interface-files:
- Added. Fixes the hat/script/pkgdirlist script to return all
directories containing .hx files, so all .hx will be installed.
Added:
packages/hat/trunk/debian/patches/15_add-missing-packages.dpatch (with props)
packages/hat/trunk/debian/patches/19_glib2.0.dpatch (with props)
packages/hat/trunk/debian/patches/20_install-all-interface-files.dpatch (with props)
Removed:
packages/hat/trunk/src/hattools/checkglib.h
Modified:
packages/hat/trunk/debian/changelog
packages/hat/trunk/debian/control
packages/hat/trunk/debian/copyright
packages/hat/trunk/debian/patches/00list
packages/hat/trunk/debian/patches/14_fix-manpage.dpatch
packages/hat/trunk/debian/patches/16_fix-buildflags.dpatch
packages/hat/trunk/debian/patches/25_no-gcc-optimisation.dpatch
packages/hat/trunk/debian/rules
Modified: packages/hat/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/changelog?rev=1093&op=diff
==============================================================================
--- packages/hat/trunk/debian/changelog (original)
+++ packages/hat/trunk/debian/changelog Sun Feb 17 03:53:19 2008
@@ -1,3 +1,39 @@
+hat (2.05+rerolled-5~pre1) unstable; urgency=high
+
+ * Set urgency to high as this upload fixes an RC bug.
+ * Update for GHC 6.8.2 (Closes: #462439):
+ - debian/control:
+ + Bump build dependency on hmake to >= 3.13 which will work with
+ GHC 6.8.2
+ + Add libghc6-parsec-dev and libghc6-parsec-prof to the build
+ dependencies
+ - debian/patches/15_add-missing-packages.dpatch: Added. The base
+ package has been split into several packages, so adjust the build
+ system for that.
+ * debian/control:
+ - Replace the build dependency on libglib1.2-dev with libglib2.0-dev.
+ - Replace Xs-Vcs-* fields with the now official Vcs-* fields.
+ - Add a Homepage field.
+ - Adjust the section of libghc6-hat-dev to libdevel to make lintian
+ happy (dev-package-should-be-section-libdevel)
+ - Bump Standards-Version to 3.6.3. No changes needed.
+ * debian/copyright:
+ - Fix lintian warning copyright-without-copyright-notice by
+ replacing copyright with Copyright and (c) with ©.
+ * debian/rules:
+ - Remove generated file src/hattools/checkglib.h on clean.
+ - Add '-optl -Wl,--as-needed' to the BUILDOPTS to unnecessary linkages
+ introduced by the build system.
+ * debian/patches/14_fix-manpage.dpatch:
+ - Updated to fix man/hat-cover.1 as well.
+ * debian/patches/19_glib2.0.dpatch:
+ - Added. Build against glib-2.0 instead of glib-1.2.
+ * debian/patches/20_install-all-interface-files:
+ - Added. Fixes the hat/script/pkgdirlist script to return all
+ directories containing .hx files, so all .hx will be installed.
+
+ -- Arjan Oosting <arjan at debian.org> Sun, 17 Feb 2008 04:48:57 +0100
+
hat (2.05+rerolled-4) unstable; urgency=low
* debian/control:
Modified: packages/hat/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/control?rev=1093&op=diff
==============================================================================
--- packages/hat/trunk/debian/control (original)
+++ packages/hat/trunk/debian/control Sun Feb 17 03:53:19 2008
@@ -3,13 +3,14 @@
Priority: optional
Maintainer: Arjan Oosting <arjan at debian.org>
Uploaders: Isaac Jones <ijones at debian.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Build-Depends: dctrl-tools, debhelper (>= 5), dpatch,
- dpkg-dev (>= 1.13.19), libncurses5-dev, libglib1.2-dev,
- hmake (>= 3.08-4), ghc6, ghc6-prof, sharutils, libghc6-mtl-dev,
- libghc6-mtl-prof
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/hat
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/hat
+ dpkg-dev (>= 1.13.19), libncurses5-dev, libglib2.0-dev,
+ hmake (>= 3.13), ghc6, ghc6-prof, sharutils, libghc6-mtl-dev,
+ libghc6-mtl-prof, libghc6-parsec-dev, libghc6-parsec-prof
+Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/hat/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk
+Homepage: http://www.haskell.org/hat/
Package: hat
Architecture: any
@@ -26,11 +27,9 @@
.
You will also need a package containing the library compiled for at
least one Haskell compiler for this to be useful.
- .
- Homepage: http://www.haskell.org/hat/
Package: libghc6-hat-dev
-Section: devel
+Section: libdevel
Architecture: any
Depends: ${haskell:Depends}, ${shlibs:Depends}
Recommends: hat (= ${binary:Version})
@@ -42,7 +41,3 @@
This package contains the HAT library compiled for ghc6.
You need it if you want to use HAT, a Haskell source-level tracer,
with ghc6.
- .
- Homepage: http://www.haskell.org/hat/
-
-
Modified: packages/hat/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/copyright?rev=1093&op=diff
==============================================================================
--- packages/hat/trunk/debian/copyright (original)
+++ packages/hat/trunk/debian/copyright Sun Feb 17 03:53:19 2008
@@ -3,32 +3,32 @@
http://haskell.org/nhc98
The Hat system as a whole was developed (mainly) at, and is copyright to
- (c) The University of York, 1996-2005.
+ © The University of York, 1996-2005.
Additionally,
hat-trans is
- (c) copyright to Olaf Chitil and Malcolm Wallace, 2002-2004.
+ © Copyright to Olaf Chitil and Malcolm Wallace, 2002-2004.
hat-observe is
- (c) copyright to Malcolm Wallace and Thorsten Brehm, 2001-2004.
+ © Copyright to Malcolm Wallace and Thorsten Brehm, 2001-2004.
hat-detect is
- (c) copyright to Malcolm Wallace and Thorsten Brehm, 2001-2004.
+ © Copyright to Malcolm Wallace and Thorsten Brehm, 2001-2004.
hat-trail is
- (c) copyright to Malcolm Wallace, 2002-2004.
+ © Copyright to Malcolm Wallace, 2002-2004.
hat-stack is
- (c) copyright to Malcolm Wallace, 2001-2004.
+ © Copyright to Malcolm Wallace, 2001-2004.
hat-check is
- (c) copyright to Colin Runciman, 2001-2004.
+ © Copyright to Colin Runciman, 2001-2004.
hat-cover is
- (c) copyright to Colin Runciman, 2004.
+ © Copyright to Colin Runciman, 2004.
hat-explore is
- (c) copyright to Olaf Chitil, 2004-2005.
+ © Copyright to Olaf Chitil, 2004-2005.
hat-anim is
- (c) copyright to Thomas Davie, 2004-2005.
+ © Copyright to Thomas Davie, 2004-2005.
hat-nonterm is
- (c) copyright to Mike Dodds, 2004.
+ © Copyright to Mike Dodds, 2004.
black-hat is
- (c) copyright to Mike Dodds, 2004.
+ © Copyright to Mike Dodds, 2004.
The Hat tools are distributed under the terms of the licence
detailed below. If you link the Hat tools with the gtk+ library
@@ -36,7 +36,7 @@
Some code from the libraries is copied directly from the
Haskell hierarchical libraries base package, which is
- (c) copyright the University of Glasgow, 2001-2004
+ © Copyright the University of Glasgow, 2001-2004
and was originally distributed under a separate BSD-style licence.
LICENCE
@@ -115,9 +115,9 @@
Public License can be found in `/usr/share/common-licenses/GPL'.
Debian packaging copyright:
- (C) 2002 - 2003 Brent A. Fulgham <bfulgham at debian.org>
- (C) 2003 - 2005 Ian Lynagh (wibble) <igloo at debian.org>
- (C) 2006 Arjan Oosting <arjanoosting at home.nl>
+ © 2002 - 2003 Brent A. Fulgham <bfulgham at debian.org>
+ © 2003 - 2005 Ian Lynagh (wibble) <igloo at debian.org>
+ © 2006 - 2008 Arjan Oosting <arjan at debian.org>
The changes in the Debian packaging made by Arjan Oosting can be
redistributed and/or modified under the same terms as hat itself.
Modified: packages/hat/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/patches/00list?rev=1093&op=diff
==============================================================================
--- packages/hat/trunk/debian/patches/00list (original)
+++ packages/hat/trunk/debian/patches/00list Sun Feb 17 03:53:19 2008
@@ -2,9 +2,12 @@
12_include-stdlib
13_byteorder
14_fix-manpage
+15_add-missing-packages
16_fix-buildflags
17_fix-ghcsym-detection
18_no-strip
+19_glib2.0
+20_install-all-interface-files
21_no-register
22_configure-incx-flag
23_debian-haskell-packages-path
Modified: packages/hat/trunk/debian/patches/14_fix-manpage.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/patches/14_fix-manpage.dpatch?rev=1093&op=diff
==============================================================================
--- packages/hat/trunk/debian/patches/14_fix-manpage.dpatch (original)
+++ packages/hat/trunk/debian/patches/14_fix-manpage.dpatch Sun Feb 17 03:53:19 2008
@@ -5,9 +5,25 @@
## DP: fix 'a newline character is not allowed in an escape name'
@DPATCH@
+diff -urNad hat~/man/hat-cover.1 hat/man/hat-cover.1
+--- hat~/man/hat-cover.1 2008-02-17 02:01:43.000000000 +0100
++++ hat/man/hat-cover.1 2008-02-17 02:02:29.000000000 +0100
+@@ -11,10 +11,10 @@
+ in the \fBhat\fR \fITRACEFILE\fR.
+ .PP
+ The \fITRACEFILE\fR may be specifed with or without a
+-.C .hat
++.B .hat
+ extension; similarly each \fISOURCEFILE\fR may be specified with or
+ without a
+-.C .hs
++.B .hs
+ extension.
+ If no \fISOURCEFILE\fR is specified
+ .B hat-cover
diff -urNad hat~/man/hat-delta.1.in hat/man/hat-delta.1.in
---- hat~/man/hat-delta.1.in 2006-10-24 21:52:26.000000000 +0200
-+++ hat/man/hat-delta.1.in 2006-10-24 22:28:36.000000000 +0200
+--- hat~/man/hat-delta.1.in 2008-02-17 01:00:46.000000000 +0100
++++ hat/man/hat-delta.1.in 2008-02-17 02:02:21.000000000 +0100
@@ -101,7 +101,7 @@
.TP
Added: packages/hat/trunk/debian/patches/15_add-missing-packages.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/patches/15_add-missing-packages.dpatch?rev=1093&op=file
==============================================================================
--- packages/hat/trunk/debian/patches/15_add-missing-packages.dpatch (added)
+++ packages/hat/trunk/debian/patches/15_add-missing-packages.dpatch Sun Feb 17 03:53:19 2008
@@ -1,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15_fix-buildflags.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 hat~/Makefile hat/Makefile
+--- hat~/Makefile 2008-02-17 01:00:46.000000000 +0100
++++ hat/Makefile 2008-02-17 01:03:34.000000000 +0100
+@@ -23,7 +23,7 @@
+ src/hatlib/Foreign/Marshal/*.hs #src/hat/lib/Foreign/C/*.hs
+ HATUI = src/hattools/Makefile* src/hattools/*.[ch] src/hattools/*.hs
+ HATTRANS= src/hattrans/Makefile* \
+- $(shell hmake -package lang -M HatTrans.hs \
++ $(shell hmake -package packedstring -M HatTrans.hs \
+ -Isrc/hattrans -Isrc/compiler98 \
+ | cut -d':' -f1 | sed -e 's/\.o$$/.hs/' | sed -e '/^. /d' )
+ DOC = docs/*
+diff -urNad hat~/src/hattools/Makefile hat/src/hattools/Makefile
+--- hat~/src/hattools/Makefile 2008-02-17 01:01:14.000000000 +0100
++++ hat/src/hattools/Makefile 2008-02-17 01:04:10.000000000 +0100
+@@ -1,7 +1,11 @@
+ include Makefile.inc
+
+ ifeq "ghc" "$(findstring ghc, ${HC})"
+- ifeq "606" "${GHCSYM}"
++ ifeq "608" "${GHCSYM}"
++HMAKEFLAGS = -I. -I$(INCDIR) -fglasgow-exts -package base -package readline \
++ -package packedstring -package containers \
++ -DUSE_READLINE=1 $(BUILDOPTS) -prof -auto-all
++ else ifeq "606" "${GHCSYM}"
+ HMAKEFLAGS = -I. -I$(INCDIR) -fglasgow-exts -package base -package readline \
+ -DUSE_READLINE=1 $(BUILDOPTS) -prof -auto-all
+ else
+@@ -48,7 +52,7 @@
+ objdir: $(OBJDIR)
+ clean:
+ rm -f $(ALLCOBJS)
+- hmake -realclean -hc=$(HC) -d$(OBJDIR) \
++ hmake -realclean -package containers -hc=$(HC) -d$(OBJDIR) \
+ HatObserve HatTrail HatDetect HatStackText HatExplore HatCoverText \
+ SrcRefViewer HatAnim BlackHat HatNonTerm PrettyHat
+ realclean: clean
+diff -urNad hat~/src/hattrans/Makefile hat/src/hattrans/Makefile
+--- hat~/src/hattrans/Makefile 2008-02-17 01:00:46.000000000 +0100
++++ hat/src/hattrans/Makefile 2008-02-17 01:03:34.000000000 +0100
+@@ -27,7 +27,9 @@
+ endif
+ ifeq "ghc" "$(findstring ghc, ${HC})"
+ IMPROVE = #-O
+- ifeq "606" "${GHCSYM}"
++ ifeq "608" "${GHCSYM}"
++HMAKEFLAGS := -package base -package packedstring $(IMPROVE)
++ else ifeq "606" "${GHCSYM}"
+ HMAKEFLAGS := -package base $(IMPROVE)
+ else
+ HMAKEFLAGS := $(shell $(LOCAL)fixghc $(GHCSYM) -package lang -package base) $(IMPROVE)
Propchange: packages/hat/trunk/debian/patches/15_add-missing-packages.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/hat/trunk/debian/patches/16_fix-buildflags.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/patches/16_fix-buildflags.dpatch?rev=1093&op=diff
==============================================================================
--- packages/hat/trunk/debian/patches/16_fix-buildflags.dpatch (original)
+++ packages/hat/trunk/debian/patches/16_fix-buildflags.dpatch Sun Feb 17 03:53:19 2008
@@ -7,11 +7,15 @@
@DPATCH@
diff -urNad hat~/src/hattools/Makefile hat/src/hattools/Makefile
---- hat~/src/hattools/Makefile 2006-12-21 20:47:24.000000000 +0100
-+++ hat/src/hattools/Makefile 2006-12-21 21:47:15.000000000 +0100
-@@ -3,13 +3,13 @@
- ifeq "ghc" "$(findstring ghc, ${HC})"
- ifeq "606" "${GHCSYM}"
+--- hat~/src/hattools/Makefile 2008-02-17 01:04:33.000000000 +0100
++++ hat/src/hattools/Makefile 2008-02-17 01:04:33.000000000 +0100
+@@ -4,16 +4,16 @@
+ ifeq "608" "${GHCSYM}"
+ HMAKEFLAGS = -I. -I$(INCDIR) -fglasgow-exts -package base -package readline \
+ -package packedstring -package containers \
+- -DUSE_READLINE=1 $(BUILDOPTS) -prof -auto-all
++ -DUSE_READLINE=1 $(shell echo ${BUILDOPTS})
+ else ifeq "606" "${GHCSYM}"
HMAKEFLAGS = -I. -I$(INCDIR) -fglasgow-exts -package base -package readline \
- -DUSE_READLINE=1 $(BUILDOPTS) -prof -auto-all
+ -DUSE_READLINE=1 $(shell echo ${BUILDOPTS})
Added: packages/hat/trunk/debian/patches/19_glib2.0.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/patches/19_glib2.0.dpatch?rev=1093&op=file
==============================================================================
--- packages/hat/trunk/debian/patches/19_glib2.0.dpatch (added)
+++ packages/hat/trunk/debian/patches/19_glib2.0.dpatch Sun Feb 17 03:53:19 2008
@@ -1,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 19_glib2.0.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 hat~/configure hat/configure
+--- hat~/configure 2008-02-16 23:39:48.000000000 +0100
++++ hat/configure 2008-02-16 23:39:48.000000000 +0100
+@@ -295,7 +295,7 @@
+ fi
+
+ echo -n "Testing for the glib library: "
+- if glib-config --version >/dev/null 2>&1
++ if pkg-config glib-2.0 --version >/dev/null 2>&1
+ then
+ echo ' yes (detected)'
+ echo '#define HAVE_GLIB 1' >src/hattools/checkglib.h
+diff -urNad hat~/src/hattools/Makefile hat/src/hattools/Makefile
+--- hat~/src/hattools/Makefile 2008-02-16 23:39:48.000000000 +0100
++++ hat/src/hattools/Makefile 2008-02-16 23:39:48.000000000 +0100
+@@ -19,8 +19,8 @@
+ endif
+
+ ifeq "glib" "$(GLIB)"
+-GLIB_CFLAGS = $(shell glib-config --cflags)
+-GLIB_LINK = $(shell glib-config --libs)
++GLIB_CFLAGS = $(shell pkg-config glib-2.0 --cflags)
++GLIB_LINK = $(shell pkg-config glib-2.0 --libs)
+ else
+ GLIB_CFLAGS =
+ GLIB_LINK =
Propchange: packages/hat/trunk/debian/patches/19_glib2.0.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/hat/trunk/debian/patches/20_install-all-interface-files.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/patches/20_install-all-interface-files.dpatch?rev=1093&op=file
==============================================================================
--- packages/hat/trunk/debian/patches/20_install-all-interface-files.dpatch (added)
+++ packages/hat/trunk/debian/patches/20_install-all-interface-files.dpatch Sun Feb 17 03:53:19 2008
@@ -1,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_install-all-interface-files.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 hat~/script/pkgdirlist hat/script/pkgdirlist
+--- hat~/script/pkgdirlist 2008-02-17 03:26:43.000000000 +0100
++++ hat/script/pkgdirlist 2008-02-17 03:28:44.000000000 +0100
+@@ -5,6 +5,7 @@
+ ;;
+ base) echo Data Debug Control Control/Monad System System/IO System/Console
+ echo Text Text/PrettyPrint Text/Html Text/Show Text/ParserCombinators
++ echo Text/ParserCombinators/Parsec
+ echo Text/Regex Foreign Foreign/Marshal Foreign/C NHC System/Directory
+ ;;
+ Cabal)
Propchange: packages/hat/trunk/debian/patches/20_install-all-interface-files.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/hat/trunk/debian/patches/25_no-gcc-optimisation.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/patches/25_no-gcc-optimisation.dpatch?rev=1093&op=diff
==============================================================================
--- packages/hat/trunk/debian/patches/25_no-gcc-optimisation.dpatch (original)
+++ packages/hat/trunk/debian/patches/25_no-gcc-optimisation.dpatch Sun Feb 17 03:53:19 2008
@@ -8,9 +8,9 @@
@DPATCH@
diff -urNad hat~/src/hatlib/Makefile hat/src/hatlib/Makefile
---- hat~/src/hatlib/Makefile 2006-11-20 22:42:20.000000000 +0100
-+++ hat/src/hatlib/Makefile 2006-11-20 22:43:11.000000000 +0100
-@@ -142,7 +142,7 @@
+--- hat~/src/hatlib/Makefile 2008-02-16 23:53:36.000000000 +0100
++++ hat/src/hatlib/Makefile 2008-02-17 00:01:51.000000000 +0100
+@@ -151,7 +151,7 @@
$(TRANSOBJS): $(OBJDIR)/Hat/%.o: %.hs
$(LOCAL)hat-trans -P. -I. -trusted -prelude $(CPPFLAGS) $<
@@ -19,7 +19,7 @@
mv $(patsubst %.hs, Hat/%.hi, $<) $(patsubst %.hs, ${OBJDIR}/Hat/%.hi, $<)
$(FIDDLEOBJS): $(OBJDIR)/Hat/%.o: %.hs
-@@ -168,7 +168,7 @@
+@@ -177,7 +177,7 @@
# Here are the extra dependencies.
$(OBJDIR)/Hat/PreludeBuiltinTypes.o: $(OBJDIR)/Hat/Hat.o
$(OBJDIR)/Hat/PreludeBuiltin.o: $(OBJDIR)/Hat/PreludeBuiltinTypes.o
Modified: packages/hat/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/rules?rev=1093&op=diff
==============================================================================
--- packages/hat/trunk/debian/rules (original)
+++ packages/hat/trunk/debian/rules Sun Feb 17 03:53:19 2008
@@ -30,6 +30,9 @@
# Disable deprection warnings
BUILDOPTS += -fno-warn-deprecations
+
+# Only link libraries we actually use
+BUILDOPTS += -optl -Wl,--as-needed
VERSION := $(strip $(shell grep "^HATVERSION" Makefile.inc | cut -f 2 -d = ))
MACHINE = $(shell script/harch)
@@ -65,7 +68,7 @@
script/hat-observe script/hat-stack script/hat-trail \
script/hat-trans script/hat-view script/pretty-hat
find src -name "*.hi" -exec rm {} \;
- rm -f src/hatlib/Hat.pkgconf src/hattools/for_foreign_imports.h
+ rm -f src/hattools/checkglib.h src/hatlib/Hat.pkgconf src/hattools/for_foreign_imports.h
rm -rf include/hat lib targets
rm -f debian/libghc6-hat-dev.postinst
dh_clean
@@ -86,6 +89,8 @@
rm "$$i.old"; \
done
rm -f debian/hat/usr/bin/harch
+# Delete empty directories installed by hat
+ find debian/hat -depth -type d -empty -delete
dh_install
# This single target is used to build all the packages, all at once, or
@@ -112,7 +117,7 @@
# Build architecture independant packages using the common target.
binary-indep: build-stamp
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+# $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
# Build architecture dependant packages using the common target.
binary-arch: install
More information about the Pkg-haskell-commits
mailing list