[Pkg-haskell-commits] darcs: uuagc: Merge

[Joachim Breitner]

Sat Feb  9 12:26:40 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge
  Ignore-this: 5e2bfa492ed4c49cff568a4c7714c853

    M ./changelog -2 +8
    M ./rules -29

Sat Feb  9 12:26:40 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge
  Ignore-this: 5e2bfa492ed4c49cff568a4c7714c853
diff -rN -u old-uuagc//changelog new-uuagc//changelog
--- old-uuagc//changelog	2013-02-09 12:43:41.231235090 +0000
+++ new-uuagc//changelog	2013-02-09 12:43:41.291720155 +0000
@@ -1,11 +1,17 @@
-uuagc (0.9.42.1-1) UNRELEASED; urgency=low
+uuagc (0.9.42.2-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata at debian.org>  Sat, 09 Feb 2013 13:13:02 +0100
+
+uuagc (0.9.42.1-1) experimental; urgency=low
 
   * Depend on haskell-devscripts 0.8.13 to ensure this packages is built
     against experimental
   * Bump standards version, no change
   * New upstream release
 
- -- Joachim Breitner <nomeata at debian.org>  Mon, 05 Nov 2012 21:53:55 +0100
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 05 Nov 2012 21:59:23 +0100
 
 uuagc (0.9.40.3-2) unstable; urgency=low
 
diff -rN -u old-uuagc//rules new-uuagc//rules
--- old-uuagc//rules	2013-02-09 12:43:41.223807608 +0000
+++ new-uuagc//rules	2013-02-09 12:43:41.283799393 +0000
@@ -3,35 +3,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
-# UUAGC is a self-bootstrapping program. Upstream ships the generated files in
-# a separate package, uuagc-boostrap. To avoid this in debian, we keep the
-# generated files in debian/generated-files. At build time, these are copied 
-# to the expected location.
-#
-# To update these, make sure a usable uuagc is on the path and run 
-# fakeroot debian/rules update-generated-files.
-
-build/uuagc:: dist-ghc/build/uuagc/uuagc-tmp build-ghc-stamp
-
-dist-ghc/build/uuagc/uuagc-tmp:
-	mkdir dist-ghc/build/uuagc/uuagc-tmp/ -p
-	cp -v debian/generated-files-uuagc/*.hs  dist-ghc/build/uuagc/uuagc-tmp/
-	cp -v debian/generated-files/*.hs  dist-ghc/build/
-	touch dist-ghc/build/uuagc/uuagc-tmp/*
-
-clean::
-	rm -f debian/bootstrapping
-
-debian/bootstrapping:
-	touch $@
-
-update-generated-files:: clean debian/bootstrapping build-ghc-stamp
-	rm -f debian/generated-files/*.hs
-	rm -f debian/generated-files-uuagc/*.hs
-	cp -v dist-ghc/build/*.hs debian/generated-files/
-	cp -v dist-ghc/build/uuagc/uuagc-tmp/*.hs debian/generated-files-uuagc/
-
-
 # UUAGC has a strange way of setting the flag: It has to be set via a cpp
 # defines when compiling Setup
 $(DEB_SETUP_BIN_NAME):