diff -u hat-2.05+rerolled/debian/patches/17_fix-ghcsym-detection.dpatch hat-2.05+rerolled/debian/patches/17_fix-ghcsym-detection.dpatch --- hat-2.05+rerolled/debian/patches/17_fix-ghcsym-detection.dpatch +++ hat-2.05+rerolled/debian/patches/17_fix-ghcsym-detection.dpatch @@ -2,7 +2,7 @@ ## 17_fix-ghcsym-detection.dpatch by Arjan Oosting ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Fix detection of GHC version number. @DPATCH@ diff -urNad hat~/script/confhat hat/script/confhat diff -u hat-2.05+rerolled/debian/patches/20_install-all-interface-files.dpatch hat-2.05+rerolled/debian/patches/20_install-all-interface-files.dpatch --- hat-2.05+rerolled/debian/patches/20_install-all-interface-files.dpatch +++ hat-2.05+rerolled/debian/patches/20_install-all-interface-files.dpatch @@ -2,7 +2,8 @@ ## 20_install-all-interface-files.dpatch by Arjan Oosting ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Fixes the hat/script/pkgdirlist script to return all +## DP: directories containing .hx files, so all .hx will be installed. @DPATCH@ diff -urNad hat~/script/pkgdirlist hat/script/pkgdirlist diff -u hat-2.05+rerolled/debian/patches/23_debian-haskell-packages-path.dpatch hat-2.05+rerolled/debian/patches/23_debian-haskell-packages-path.dpatch --- hat-2.05+rerolled/debian/patches/23_debian-haskell-packages-path.dpatch +++ hat-2.05+rerolled/debian/patches/23_debian-haskell-packages-path.dpatch @@ -2,7 +2,7 @@ ## 23_debian-haskell-packages-path.dpatch by Arjan Oosting ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Adjust paths to Debian 'standard' @DPATCH@ diff -urNad hat~/script/confhat hat/script/confhat diff -u hat-2.05+rerolled/debian/patches/18_no-strip.dpatch hat-2.05+rerolled/debian/patches/18_no-strip.dpatch --- hat-2.05+rerolled/debian/patches/18_no-strip.dpatch +++ hat-2.05+rerolled/debian/patches/18_no-strip.dpatch @@ -2,7 +2,8 @@ ## 18_no-strip.dpatch by Arjan Oosting ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Do not strip hat-trans and let dh_strip, which does respect +## DP: the nostrip build option, handle it. @DPATCH@ diff -urNad hat~/src/hattrans/Makefile hat/src/hattrans/Makefile diff -u hat-2.05+rerolled/debian/patches/15_add-missing-packages.dpatch hat-2.05+rerolled/debian/patches/15_add-missing-packages.dpatch --- hat-2.05+rerolled/debian/patches/15_add-missing-packages.dpatch +++ hat-2.05+rerolled/debian/patches/15_add-missing-packages.dpatch @@ -2,7 +2,7 @@ ## 15_fix-buildflags.dpatch by Arjan Oosting ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Adjust build system for split base library @DPATCH@ diff -urNad hat~/Makefile hat/Makefile diff -u hat-2.05+rerolled/debian/patches/19_glib2.0.dpatch hat-2.05+rerolled/debian/patches/19_glib2.0.dpatch --- hat-2.05+rerolled/debian/patches/19_glib2.0.dpatch +++ hat-2.05+rerolled/debian/patches/19_glib2.0.dpatch @@ -2,7 +2,7 @@ ## 19_glib2.0.dpatch by Arjan Oosting ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Build against glib 2.0 instead of glib 1.2 @DPATCH@ diff -urNad hat~/configure hat/configure diff -u hat-2.05+rerolled/debian/changelog hat-2.05+rerolled/debian/changelog --- hat-2.05+rerolled/debian/changelog +++ hat-2.05+rerolled/debian/changelog @@ -1,3 +1,34 @@ +hat (2.05+rerolled-7ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes (LP: #254642): + - debian/rules: + + Unexport default LDFLAGS as ghc6 doesn't understand them. + + -- Nathan Handler Mon, 04 Aug 2008 07:55:19 -0500 + +hat (2.05+rerolled-7) unstable; urgency=low + + * debian/rules: + - Also add s390 to the list architectures where hat should be + build without optimisation + + -- Arjan Oosting Tue, 22 Jul 2008 23:34:43 +0200 + +hat (2.05+rerolled-6) unstable; urgency=low + + * debian/control: + - Bump Standards-Version to 3.8.0. Added debian/README.source to + comply with new policy + * debian/patches: + - Added descriptions to most patches to fix lintian warning + dpatch-missing-description + * debian/rules: + - Add mipsel and powerpc to the list of architectures where + we build hat without any optimisation to keep the buildd + from thrashing. + + -- Arjan Oosting Tue, 22 Jul 2008 21:58:08 +0200 + hat (2.05+rerolled-5ubuntu1) hardy; urgency=low * debian/rules: @@ -390 +420,0 @@ - diff -u hat-2.05+rerolled/debian/control hat-2.05+rerolled/debian/control --- hat-2.05+rerolled/debian/control +++ hat-2.05+rerolled/debian/control @@ -4,7 +4,7 @@ Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Arjan Oosting Uploaders: Isaac Jones -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Build-Depends: dctrl-tools, debhelper (>= 5), dpatch, dpkg-dev (>= 1.13.19), libncurses5-dev, libglib2.0-dev, hmake (>= 3.13), ghc6, ghc6-prof, sharutils, libghc6-mtl-dev, diff -u hat-2.05+rerolled/debian/rules hat-2.05+rerolled/debian/rules --- hat-2.05+rerolled/debian/rules +++ hat-2.05+rerolled/debian/rules @@ -20,7 +20,7 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) BUILDOPTS := -O0 else - ifneq (,$(findstring $(DEB_HOST_ARCH),"arm m68k")) + ifneq (,$(findstring $(DEB_HOST_ARCH),"arm m68k mipsel powerpc s390")) BUILDOPTS := -O0 else BUILDOPTS := -O2 only in patch2: unchanged: --- hat-2.05+rerolled.orig/debian/README.source +++ hat-2.05+rerolled/debian/README.source @@ -0,0 +1,11 @@ +The used patch system is dpatch. + +To patch the source run "debian/rules patch" + +To add a new patch: +* put it under debian/patches +* add it to debian/patches/00list + +To unpatch the source run "debian/rules unpatch" + +See /usr/share/doc/dpatch for more information.