Hi Ian,

I have prepared an NMU to fix the the FTBFS. It is an upgrade to the new
upstream version of happy and I have included some other fixes as well
(see the changelog below)

Attached is the interdiff (excluding the upstream changes).

Greetings Arjan

happy (1.17-0.1) unstable; urgency=low

  * Non-maintainer upload.
  * New upstream release: (Closes: #470942)
    - Cabal 1.2 is now required. (Closes: #460375)
    - Works with upcoming GHC 6.8.1
    - Fix the 'parE' bug (poor error message for errors in the grammar)
    - Some performance improvements to Happy itsel
  * debian/control:
    - Added Homepage field.
    - Bump the build dependency on ghc6 to 6.8.2 as the packages needs
      Cabal 1.2 to build.
    - Bump the Standards-Version to 3.7.3. No changes needed.
    - Add happy and libghc6-mtl-dev to the build dependencies.
  * debian/copyright:
    - Fix debian-copyright-file-uses-obsolete-national-encoding lintian
      warning.
    - Update debian/copyright file with info from upstream LICENSE file.
  * debian/doc-base:
    - Adjust section to Programming/Haskell
  * debian/get_version.hs: Updated for Cabal 1.2
  * debian/rules:
    - Fix debian-rules-ignores-make-clean-error lintian warning.
    - Remove the LICENSE installed by ./setup copy

 -- Arjan Oosting <[EMAIL PROTECTED]>  Thu, 01 May 2008 12:05:29 +0200



--- happy-1.16~rc2/debian/changelog	2008-05-01 12:47:25.000000000 +0200
+++ happy-1.17/debian/changelog	2008-05-01 12:47:25.000000000 +0200
@@ -1,3 +1,30 @@
+happy (1.17-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release: (Closes: #470942)
+    - Cabal 1.2 is now required. (Closes: #460375)
+    - Works with upcoming GHC 6.8.1
+    - Fix the 'parE' bug (poor error message for errors in the grammar)
+    - Some performance improvements to Happy itsel
+  * debian/control:
+    - Added Homepage field.
+    - Bump the build dependency on ghc6 to 6.8.2 as the packages needs
+      Cabal 1.2 to build.
+    - Bump the Standards-Version to 3.7.3. No changes needed.
+    - Add happy and libghc6-mtl-dev to the build dependencies.
+  * debian/copyright:
+    - Fix debian-copyright-file-uses-obsolete-national-encoding lintian
+      warning.
+    - Update debian/copyright file with info from upstream LICENSE file.
+  * debian/doc-base:
+    - Adjust section to Programming/Haskell
+  * debian/get_version.hs: Updated for Cabal 1.2
+  * debian/rules:
+    - Fix debian-rules-ignores-make-clean-error lintian warning.
+    - Remove the LICENSE installed by ./setup copy
+  
+ -- Arjan Oosting <[EMAIL PROTECTED]>  Thu, 01 May 2008 12:05:29 +0200
+
 happy (1.16~rc2-1) unstable; urgency=low
 
   * New upstream (release candidate) version.
--- happy-1.16~rc2/debian/control	2008-05-01 12:47:25.000000000 +0200
+++ happy-1.17/debian/control	2008-05-01 12:47:25.000000000 +0200
@@ -2,8 +2,9 @@
 Section: devel
 Priority: optional
 Maintainer: Ian Lynagh (wibble) <[EMAIL PROTECTED]>
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4), docbook-utils, ghc6 (>= 6.4.2), docbook-xsl, docbook-xml, xsltproc
+Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 4), docbook-utils, ghc6 (>= 6.8.2), docbook-xsl, docbook-xml, xsltproc, happy, libghc6-mtl-dev
+Homepage: http://www.haskell.org/happy
 
 Package: happy
 Architecture: any
--- happy-1.16~rc2/debian/copyright	2008-05-01 12:47:25.000000000 +0200
+++ happy-1.17/debian/copyright	2008-05-01 12:47:25.000000000 +0200
@@ -9,34 +9,30 @@
 		
 Copyright:
 
-The Glasgow Haskell Compiler License
+Copyright 2001, Simon Marlow and Andy Gill.  All rights reserved.
 
-Copyright 1999, The University Court of the University of Glasgow.
-All rights reserved.
+Extensions to implement Tomita's Generalized LR parsing:
+  Copyright 2004, University of Durham, Paul Callaghan and Ben Medlock.
+  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-· Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-· Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-· Neither name of the University nor the names of its contributors may be
-  used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
-GLASGOW AND THE CONTRIBUTORS ÄS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+ 
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+ 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- happy-1.16~rc2/debian/get_version.hs	2008-05-01 12:47:25.000000000 +0200
+++ happy-1.17/debian/get_version.hs	2008-05-01 12:47:25.000000000 +0200
@@ -4,10 +4,11 @@
 import Distribution.Package
 import Distribution.PackageDescription
 import Distribution.Simple.Utils
+import Distribution.Verbosity
 import Distribution.Version
 
 main :: IO ()
-main = do fp <- findPackageDesc "."
-          pd <- readPackageDescription fp
-          putStr $ showVersion $ pkgVersion $ package pd
+main = do fp <- findPackageDesc normal "."
+          pd <- readPackageDescription normal fp
+          putStr $ showVersion $ pkgVersion $ package $ packageDescription pd
 
--- happy-1.16~rc2/debian/rules	2008-05-01 12:47:25.000000000 +0200
+++ happy-1.17/debian/rules	2008-05-01 12:47:25.000000000 +0200
@@ -37,9 +37,9 @@
 	dh_testroot
 	rm -f configure-stamp build-stamp install-stamp
 	
-	-$(MAKE) -C doc clean
+	[ ! -f doc/config.mk ] || $(MAKE) -C doc clean
 	# Remove these so setup clean doesn't remove the generated files
-	rm -f src/Parser.ly src/AttrGrammarParser.ly
+	# rm -f src/Parser.ly src/AttrGrammarParser.ly
 	ghc6 --make Setup.lhs -o setup
 	-./setup clean
 	rm -f Setup.o Setup.hi setup
@@ -58,6 +58,7 @@
 	dh_installdirs usr/share/doc/happy/html
 
 	./setup copy --destdir=`pwd`/debian/`dh_listpackages`
+	rm -r `pwd`/debian/`dh_listpackages`/usr/share/doc/happy-*/
 
 	cp -a doc/happy/* `pwd`/debian/`dh_listpackages`/usr/share/doc/happy/html/
 	cp -a examples    `pwd`/debian/`dh_listpackages`/usr/share/doc/happy/
--- happy-1.16~rc2/debian/watch	1970-01-01 01:00:00.000000000 +0100
+++ happy-1.17/debian/watch	2008-05-01 12:47:25.000000000 +0200
@@ -0,0 +1,2 @@
+version=3
+http://www.haskell.org/happy/ .*/happy-([\d\.]*).tar.gz

Attachment: signature.asc
Description: Dit berichtdeel is digitaal ondertekend

Reply via email to