[med-svn] r7536 - in trunk/packages/mira/trunk/debian: . patches

[Timothy Booth]

Author: tbooth-guest
Date: 2011-08-24 14:22:22 +0000 (Wed, 24 Aug 2011)
New Revision: 7536

Modified:
   trunk/packages/mira/trunk/debian/changelog
   trunk/packages/mira/trunk/debian/control
   trunk/packages/mira/trunk/debian/patches/read_default_constructor.patch
   trunk/packages/mira/trunk/debian/rules
Log:
Fixed cleanup so that the source package builds properly - some build files were not being
removed properly.


Modified: trunk/packages/mira/trunk/debian/changelog
===================================================================
--- trunk/packages/mira/trunk/debian/changelog	2011-08-24 10:40:06 UTC (rev 7535)
+++ trunk/packages/mira/trunk/debian/changelog	2011-08-24 14:22:22 UTC (rev 7536)
@@ -1,11 +1,13 @@
-mira (3.4.0-1) unstable; urgency=low
+mira (3.4.0-1ubuntu1) lucid; urgency=low
 
+  * Re-version for PPA build
   * New upstream version.
     - added default constructor to avoid FTBFS
   * Sposoring Tim's work for Debian
   * Using 3.0 (quilt) source format for bz2 upstream
+  * -- Steffen Moeller <moeller at debian.org>  Tue, 23 Aug 2011 20:46:32 +0200
 
- -- Steffen Moeller <moeller at debian.org>  Tue, 23 Aug 2011 20:46:32 +0200
+ -- Tim Booth <tbooth at ceh.ac.uk>  Wed, 24 Aug 2011 11:48:15 +0100
 
 mira (3.4rc3-2) lucid; urgency=low
 

Modified: trunk/packages/mira/trunk/debian/control
===================================================================
--- trunk/packages/mira/trunk/debian/control	2011-08-24 10:40:06 UTC (rev 7535)
+++ trunk/packages/mira/trunk/debian/control	2011-08-24 14:22:22 UTC (rev 7536)
@@ -7,7 +7,7 @@
  Tim Booth <tbooth at ceh.ac.uk>
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, dblatex, docbook-xsl,
  libboost-thread-dev, libexpat1-dev, libtcmalloc-minimal0, perl,
- quilt,
+ quilt (>= 0.46-7~),
  zlib1g-dev
 Standards-Version: 3.9.2
 Homepage: http://chevreux.org/projects_mira.html

Modified: trunk/packages/mira/trunk/debian/patches/read_default_constructor.patch
===================================================================
--- trunk/packages/mira/trunk/debian/patches/read_default_constructor.patch	2011-08-24 10:40:06 UTC (rev 7535)
+++ trunk/packages/mira/trunk/debian/patches/read_default_constructor.patch	2011-08-24 14:22:22 UTC (rev 7536)
@@ -1,7 +1,12 @@
-Index: mira-3.4.0/src/mira/read.H
-===================================================================
---- mira-3.4.0.orig/src/mira/read.H	2011-08-23 21:25:23.821159194 +0200
-+++ mira-3.4.0/src/mira/read.H	2011-08-23 21:53:40.777573643 +0200
+# Comment by Steffen on 23/08/11:
+# while building MIRA (g++ 4.6) I came across
+#
+# read.C:45:28: error: uninitialized const ‘Read::REA_bposhashstat_default’ [-fpermissive]
+# ../../src/mira/read.H:159:10: note: ‘const struct Read::bposhashstat_t’ has no user-provided default constructor
+# 
+# which I spontaneously decided to silence with
+--- a/src/mira/read.H
++++ b/src/mira/read.H
 @@ -213,6 +213,10 @@
        ostr << "r; " << bhs.rev << ' ';
        return ostr;

Modified: trunk/packages/mira/trunk/debian/rules
===================================================================
--- trunk/packages/mira/trunk/debian/rules	2011-08-24 10:40:06 UTC (rev 7535)
+++ trunk/packages/mira/trunk/debian/rules	2011-08-24 14:22:22 UTC (rev 7536)
@@ -34,6 +34,16 @@
 #troublesome libbgoogle-perftools-dev, see README.Debian
 export LDFLAGS=-L$(CURDIR)/lib
 
+#Must clean up the docs before cleaning out config.status
+#Then scrub some junk not picked up by 'make clean'
+override_dh_auto_clean:
+	( cd doc ; make clean ) || true
+	dh_auto_clean
+	find * -name Makefile -exec rm '{}' ';'
+	find * -name '*.xxd.H' -exec rm '{}' ';'
+	find * -name '*.par.H' -exec rm '{}' ';'
+	find * -name 'compileinfo.*' -exec rm '{}' ';'
+
 override_dh_clean:
 	dh_clean
 	rm -rf lib