[Pkg-haskell-commits] r763 - in /packages/helium/trunk: debian/changelog debian/patches/00list debian/patches/06_no-strip.dpatch debian/rules helium/src/codegeneration/CodeGeneration.hs

Tue Aug 21 16:05:29 UTC 2007

Author: arjan
Date: Tue Aug 21 16:05:29 2007
New Revision: 763

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=763
Log:
 r2049 at nebula:  arjan | 2007-08-12 23:05:14 +0200
 * debian/patches/06_no-strip.dpatch: Added. Do not strip binaries
   unconditionally. (Closes: #437172) 
 * debian/rules:
   - Remove helium/src/codegeneration/CodeGeneration.hs on clean to keep
     the diff.gz small and tidy. The file will be created during the
     build.
   - Call 'make ag' before 'make depend' as it generates some Haskell
     source files needed in the depend target.

Added:
    packages/helium/trunk/debian/patches/06_no-strip.dpatch   (with props)
Removed:
    packages/helium/trunk/helium/src/codegeneration/CodeGeneration.hs
Modified:
    packages/helium/trunk/debian/changelog
    packages/helium/trunk/debian/patches/00list
    packages/helium/trunk/debian/rules

Modified: packages/helium/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/helium/trunk/debian/changelog?rev=763&op=diff
==============================================================================

--- packages/helium/trunk/debian/changelog (original)
+++ packages/helium/trunk/debian/changelog Tue Aug 21 16:05:29 2007
@@ -1,9 +1,17 @@
-helium (1.6-3~pre2) unstable; urgency=low
+helium (1.6-3~pre3) unstable; urgency=low
 
   * debian/control:
     - Add Xs-Vcs-Svn and Xs-Vcs-Browser fields.
+  * debian/patches/06_no-strip.dpatch: Added. Do not strip binaries
+    unconditionally. (Closes: #437172) 
+  * debian/rules:
+    - Remove helium/src/codegeneration/CodeGeneration.hs on clean to keep
+      the diff.gz small and tidy. The file will be created during the
+      build.
+    - Call 'make ag' before 'make depend' as it generates some Haskell
+      source files needed in the depend target.
 
- -- Arjan Oosting <arjan at debian.org>  Fri, 13 Apr 2007 10:40:45 +0200
+ -- Arjan Oosting <arjan at debian.org>  Sun, 12 Aug 2007 22:54:44 +0200
 
 helium (1.6-2) unstable; urgency=low
 

Modified: packages/helium/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/helium/trunk/debian/patches/00list?rev=763&op=diff
==============================================================================
--- packages/helium/trunk/debian/patches/00list (original)
+++ packages/helium/trunk/debian/patches/00list Tue Aug 21 16:05:29 2007
@@ -3,4 +3,5 @@
 03_add-readline-support
 04_fixes-for-ghc6
 05_fixes-for-64bit
+06_no-strip
 10_autoconf

Added: packages/helium/trunk/debian/patches/06_no-strip.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/helium/trunk/debian/patches/06_no-strip.dpatch?rev=763&op=file
==============================================================================
--- packages/helium/trunk/debian/patches/06_no-strip.dpatch (added)
+++ packages/helium/trunk/debian/patches/06_no-strip.dpatch Tue Aug 21 16:05:29 2007
@@ -1,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_no-strip.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 helium~/helium/src/Makefile.in helium/helium/src/Makefile.in
+--- helium~/helium/src/Makefile.in	2007-08-12 21:28:06.000000000 +0200
++++ helium/helium/src/Makefile.in	2007-08-12 21:30:06.000000000 +0200
+@@ -201,7 +201,7 @@
+ 	@echo "****************************************************"
+ 	$(HC)	-o $(HELIUMBINDIR)/$(MAIN)$(EXE) $(HC_OPTS) $(OBJS)
+ ifdef STRIP
+-	$(STRIP) $(HELIUMBINDIR)/$(MAIN)$(EXE)
++#	$(STRIP) $(HELIUMBINDIR)/$(MAIN)$(EXE)
+ endif
+ 
+ all: ag compiler coreasm lvmrun libraries texthint status
+@@ -240,7 +240,7 @@
+ 	@echo "****************************************************"
+ 	$(HC) $(HC_OPTS) -o $(HELIUMBINDIR)/texthint$(EXE) texthint/Main.o \
+                       utils/OSSpecific.o
+-	$(STRIP) $(HELIUMBINDIR)/texthint$(EXE)
++#	$(STRIP) $(HELIUMBINDIR)/texthint$(EXE)
+ 
+ texthint/Main.o: utils/OSSpecific.hi texthint/Main.hs
+ 
+diff -urNad helium~/lvm/src/lib/makefile helium/lvm/src/lib/makefile
+--- helium~/lvm/src/lib/makefile	2007-08-12 21:28:06.000000000 +0200
++++ helium/lvm/src/lib/makefile	2007-08-12 21:31:17.000000000 +0200
+@@ -55,7 +55,7 @@
+ # The main target
+ $(MAIN)$(EXE): $(OBJS)
+ 	  $(HC)	-o $@ $(HC_OPTS) $(OBJS)
+-	  $(STRIP) $@
++#	  $(STRIP) $@
+ 
+ common/ghc/Special.hi: common/ghc/Special.hs
+ 	$(HC) -c $< -cpp -fglasgow-exts $(HC_OPTS) 
+diff -urNad helium~/lvm/src/runtime/makefile helium/lvm/src/runtime/makefile
+--- helium~/lvm/src/runtime/makefile	2007-05-11 07:32:11.000000000 +0200
++++ helium/lvm/src/runtime/makefile	2007-08-12 21:32:04.000000000 +0200
+@@ -51,7 +51,7 @@
+ 
+ lvmrun$(EXE): $(OBJS)
+ 	$(LINK) -o $@ $(LINKOPT) $(OBJS)
+-	$(STRIP) $@
++#	$(STRIP) $@
+ 
+ core/evaluator.o: core/evaluator.c
+ 	$(CC) -o $@ -c $< $(CCOPT_FAST)
+@@ -82,4 +82,4 @@
+ 	sed -e 's/\(.*\.o\)/prim\/\1/' .depend.temp >> .depend
+ 	$(RM) .depend.temp
+ 
+-include .depend
+\ No newline at end of file
++include .depend

Propchange: packages/helium/trunk/debian/patches/06_no-strip.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/helium/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/helium/trunk/debian/rules?rev=763&op=diff
==============================================================================
--- packages/helium/trunk/debian/rules (original)
+++ packages/helium/trunk/debian/rules Tue Aug 21 16:05:29 2007
@@ -49,6 +49,7 @@
 build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
+	$(MAKE_ENVVARS) $(MAKE) -C helium/src ag
 	$(MAKE_ENVVARS) $(MAKE) -C helium/src depend
 	$(MAKE_ENVVARS) $(MAKE) -C helium/src
 	touch $@
@@ -67,6 +68,7 @@
 	    helium/src/Makefile.bak helium/src/utils/Logger.hs \
 	    helium/src/utils/OSSpecific.hs lvm/src/config/makefile \
 	    lvm/src/config/m.h lvm/src/config/s.h
+	rm -f helium/src/codegeneration/CodeGeneration.hs
 	dh_clean 
 
 install: build


