[med-svn] [mira] 03/05: Imported Debian patch 3.4.0-3

[Michael Crusoe]

This is an automated email from the git hooks/post-receive script.

misterc-guest pushed a commit to branch master
in repository mira.

commit 15dab0f4fb4e3c389623715f1f7702a075213af9
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Sep 3 01:02:10 2011 +0200

    Imported Debian patch 3.4.0-3
---
 debian/changelog                              | 16 ++++++++++++++++
 debian/control                                |  5 ++---
 debian/patches/read_default_constructor.patch | 13 +++++++++----
 debian/rules                                  | 10 ++++++++++
 debian/stamp-autotools-files                  |  0
 debian/stamp-makefile-build                   |  0
 debian/stamp-makefile-check                   |  0
 7 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cec164f..559b4f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+mira (3.4.0-3) unstable; urgency=low
+
+  * Rendering Tim's additions available for Debian
+
+ -- Steffen Moeller <moeller at debian.org>  Sat, 03 Sep 2011 01:02:10 +0200
+
+mira (3.4.0-2ubuntu5) lucid; urgency=low
+
+  * Small fix to clean target and suppress warnings
+    on Lucid backport.
+  * Fixed missing dependency which caused misleading configure
+    failure.
+  * Yet another missing build dep - flex and xxd
+
+ -- Tim Booth <tbooth at ceh.ac.uk>  Tue, 30 Aug 2011 17:17:11 +0100
+
 mira (3.4.0-2) unstable; urgency=low
 
   * Fixing source tree (removed PDF with no source)
diff --git a/debian/control b/debian/control
index 9061702..7bb3473 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,8 @@ DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <plessy at debian.org>, Steffen Moeller <moeller at debian.org>,
  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,
- zlib1g-dev
+ libboost-thread-dev, libboost-regex-dev, libexpat1-dev, libtcmalloc-minimal0, perl,
+ quilt (>= 0.46-7~), flex, vim-common, zlib1g-dev
 Standards-Version: 3.9.2
 Homepage: http://chevreux.org/projects_mira.html
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mira/trunk/?rev=0&sc=0
diff --git a/debian/patches/read_default_constructor.patch b/debian/patches/read_default_constructor.patch
index f988bc4..56ea4f4 100644
--- a/debian/patches/read_default_constructor.patch
+++ b/debian/patches/read_default_constructor.patch
@@ -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;
diff --git a/debian/rules b/debian/rules
index 720dc78..0e01878 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,16 @@ override_dh_install:
 #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
diff --git a/debian/stamp-autotools-files b/debian/stamp-autotools-files
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/stamp-makefile-build b/debian/stamp-makefile-build
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/stamp-makefile-check b/debian/stamp-makefile-check
deleted file mode 100644
index e69de29..0000000

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mira.git