[Pkg-haskell-commits] darcs: haskell-devscripts: s/GHC6/GHC in GHC_VERSION, BUILD_GHC, DEB_SETUP_GHC_CONFIGURE_ARGS, but provide/use the “other” variable too, to avoid breaking existing packages.

[Joachim Breitner]

Sat Jun  4 20:22:04 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * s/GHC6/GHC in GHC_VERSION, BUILD_GHC, DEB_SETUP_GHC_CONFIGURE_ARGS, but provide/use the [_\e2_][_\80_][_\9c_]other[_\e2_][_\80_][_\9d_] variable too, to avoid breaking existing packages.
  Ignore-this: 31af5a74c311fe104736ebad9ad84e73

    M ./debian/changelog +7
    M ./hlibrary.mk -5 +7

Sat Jun  4 20:22:04 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * s/GHC6/GHC in GHC_VERSION, BUILD_GHC, DEB_SETUP_GHC_CONFIGURE_ARGS, but provide/use the “other” variable too, to avoid breaking existing packages.
  Ignore-this: 31af5a74c311fe104736ebad9ad84e73
diff -rN -u old-haskell-devscripts//debian/changelog new-haskell-devscripts//debian/changelog
--- old-haskell-devscripts//debian/changelog	2011-06-04 20:26:50.071780198 +0000
+++ new-haskell-devscripts//debian/changelog	2011-06-04 20:26:50.093277649 +0000
@@ -1,3 +1,10 @@
+haskell-devscripts (0.8.5) UNRELEASED; urgency=low
+
+  * s/GHC6/GHC in GHC_VERSION, BUILD_GHC, DEB_SETUP_GHC_CONFIGURE_ARGS, but
+    provide/use the “other” variable too, to avoid breaking existing packages.
+
+ -- Joachim Breitner <nomeata at debian.org>  Sat, 04 Jun 2011 22:21:01 +0200
+
 haskell-devscripts (0.8.4) unstable; urgency=low
 
   [ Marco Túlio Gontijo e Silva ]
diff -rN -u old-haskell-devscripts//hlibrary.mk new-haskell-devscripts//hlibrary.mk
--- old-haskell-devscripts//hlibrary.mk	2011-06-04 20:26:50.071780198 +0000
+++ new-haskell-devscripts//hlibrary.mk	2011-06-04 20:26:50.089275693 +0000
@@ -45,19 +45,21 @@
 
 # most likely you don't need to touch this one
 GHC6_VERSION = $(shell ghc --numeric-version)
-DEB_HADDOCK_DIR ?= /usr/lib/ghc-$(GHC6_VERSION)/haddock/$(CABAL_PACKAGE)-$(CABAL_VERSION)/
+GHC_VERSION = $(shell ghc --numeric-version)
+DEB_HADDOCK_DIR ?= /usr/lib/ghc-$(GHC_VERSION)/haddock/$(CABAL_PACKAGE)-$(CABAL_VERSION)/
 
 ifndef DEB_NO_IMPLICIT_HADDOCK_HYPERLINK
 DEB_HADDOCK_OPTS += --hyperlink-source
 endif
 
+BUILD_GHC := $(DEB_SETUP_BIN_NAME) build
 BUILD_GHC6 := $(DEB_SETUP_BIN_NAME) build
 MAKEFILE := debian/hlibrary.Makefile
 
 #ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 #    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 #    MAKEFLAGS := -j$(NUMJOBS)
-#    BUILD_GHC6 := $(DEB_SETUP_BIN_NAME) makefile -f $(MAKEFILE) && $(MAKE) $(MAKEFLAGS) -f $(MAKEFILE) && $(BUILD_GHC6)
+#    BUILD_GHC := $(DEB_SETUP_BIN_NAME) makefile -f $(MAKEFILE) && $(MAKE) $(MAKEFLAGS) -f $(MAKEFILE) && $(BUILD_GHC)
 #endif
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -84,10 +86,10 @@
 		--builddir=dist-ghc \
 		--haddockdir=$(DEB_HADDOCK_DIR) \
 		--htmldir=$(DEB_HADDOCK_HTML_DIR) $(ENABLE_PROFILING) \
-		$(DEB_SETUP_GHC6_CONFIGURE_ARGS) $(OPTIMIZATION)
+		$(DEB_SETUP_GHC6_CONFIGURE_ARGS) $(DEB_SETUP_GHC_CONFIGURE_ARGS) $(OPTIMIZATION)
 
 build-ghc-stamp: dist-ghc
-	$(BUILD_GHC6) --builddir=dist-ghc
+	$(BUILD_GHC) --builddir=dist-ghc
 	touch build-ghc-stamp
 
 build/libghc-$(CABAL_PACKAGE)-prof build/libghc-$(CABAL_PACKAGE)-dev:: build-ghc-stamp
@@ -113,7 +115,7 @@
 		-exec install -Dm 644 '{}' ../$(notdir $@)/'{}' ';'
 	pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | sed -r 's,.*: ,,'`; \
 		$(if $(HASKELL_HIDE_PACKAGES),sed -i 's/^exposed: True$$/exposed: False/' $$pkg_config;) \
-		install -Dm 644 $$pkg_config debian/$(notdir $@)/var/lib/ghc-$(GHC6_VERSION)/package.conf.d/$$pkg_config; \
+		install -Dm 644 $$pkg_config debian/$(notdir $@)/var/lib/ghc-$(GHC_VERSION)/package.conf.d/$$pkg_config; \
 		rm -f $$pkg_config
 	dh_haskell_provides -p$(notdir $@)
 	dh_haskell_depends -p$(notdir $@)