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

[Andreas Tille]

Author: tille
Date: 2011-12-08 08:14:46 +0000 (Thu, 08 Dec 2011)
New Revision: 8831

Modified:
   trunk/packages/mira/trunk/debian/changelog
   trunk/packages/mira/trunk/debian/control
   trunk/packages/mira/trunk/debian/patches/add_shebang_lines
   trunk/packages/mira/trunk/debian/patches/read_default_constructor.patch
   trunk/packages/mira/trunk/debian/patches/xsltproc_nonet_for_doc_build
Log:
Adapt to new upstream version; however this FTBFS (probably old version as well)


Modified: trunk/packages/mira/trunk/debian/changelog
===================================================================
--- trunk/packages/mira/trunk/debian/changelog	2011-12-07 21:28:19 UTC (rev 8830)
+++ trunk/packages/mira/trunk/debian/changelog	2011-12-08 08:14:46 UTC (rev 8831)
@@ -1,3 +1,18 @@
+mira (3.4.0.1-1) UNRELEASED; urgency=low
+
+  * New upstream version (refreshed quilt patches)
+    Closes: #648762 (at least if I'm not missleaded - feel free to reopen)
+  * debian/control:
+    - Added myself to Uploaders
+    - Depends: libtcmalloc-minimal0 [i386 amd64]
+      Thanks for the patch to Michael Terry <michael.terry at canonical.com>
+      however I left out powerpc where libtcmalloc-minimal0 is not
+      available
+      Closes: #649093
+    - Fixed Vcs fields
+
+ -- Andreas Tille <tille at debian.org>  Thu, 08 Dec 2011 08:50:19 +0100
+
 mira (3.4.0-3ubuntu1) lucid; urgency=low
 
   * Small fix to dependencies - there is no "mira" binary package 

Modified: trunk/packages/mira/trunk/debian/control
===================================================================
--- trunk/packages/mira/trunk/debian/control	2011-12-07 21:28:19 UTC (rev 8830)
+++ trunk/packages/mira/trunk/debian/control	2011-12-08 08:14:46 UTC (rev 8831)
@@ -4,14 +4,15 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <plessy at debian.org>, Steffen Moeller <moeller at debian.org>,
- Tim Booth <tbooth at ceh.ac.uk>
+ Tim Booth <tbooth at ceh.ac.uk>, Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, dblatex, docbook-xsl,
- libboost-thread-dev, libboost-regex-dev, libexpat1-dev, libtcmalloc-minimal0, perl,
- quilt (>= 0.46-7~), flex, vim-common, zlib1g-dev
+ libboost-thread-dev, libboost-regex-dev, libexpat1-dev,
+ libtcmalloc-minimal0 [i386 amd64], 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
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/mira/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mira/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/mira/trunk/
 
 Package: mira-assembler
 Architecture: any

Modified: trunk/packages/mira/trunk/debian/patches/add_shebang_lines
===================================================================
--- trunk/packages/mira/trunk/debian/patches/add_shebang_lines	2011-12-07 21:28:19 UTC (rev 8830)
+++ trunk/packages/mira/trunk/debian/patches/add_shebang_lines	2011-12-08 08:14:46 UTC (rev 8831)
@@ -1,6 +1,6 @@
 #Add a missing #! line to 2 demo scripts just to please Lintian
---- a/minidemo/solexa1/runme.sh
-+++ b/minidemo/solexa1/runme.sh
+--- mira-3.4.0.1.orig/minidemo/solexa1/runme.sh
++++ mira-3.4.0.1/minidemo/solexa1/runme.sh
 @@ -1,7 +1,8 @@
 +#!/bin/sh
  
@@ -12,8 +12,8 @@
 -echo "Please read the README to know what is in the results."
 \ No newline at end of file
 +echo "Please read the README to know what is in the results."
---- a/minidemo/solexa2/runme.sh
-+++ b/minidemo/solexa2/runme.sh
+--- mira-3.4.0.1.orig/minidemo/solexa2/runme.sh
++++ mira-3.4.0.1/minidemo/solexa2/runme.sh
 @@ -1,7 +1,8 @@
 +#!/bin/sh
  

Modified: trunk/packages/mira/trunk/debian/patches/read_default_constructor.patch
===================================================================
--- trunk/packages/mira/trunk/debian/patches/read_default_constructor.patch	2011-12-07 21:28:19 UTC (rev 8830)
+++ trunk/packages/mira/trunk/debian/patches/read_default_constructor.patch	2011-12-08 08:14:46 UTC (rev 8831)
@@ -5,9 +5,9 @@
 # ../../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 @@
+--- mira-3.4.0.1.orig/src/mira/read.H
++++ mira-3.4.0.1/src/mira/read.H
+@@ -215,6 +215,10 @@
        ostr << "r; " << bhs.rev << ' ';
        return ostr;
      }

Modified: trunk/packages/mira/trunk/debian/patches/xsltproc_nonet_for_doc_build
===================================================================
--- trunk/packages/mira/trunk/debian/patches/xsltproc_nonet_for_doc_build	2011-12-07 21:28:19 UTC (rev 8830)
+++ trunk/packages/mira/trunk/debian/patches/xsltproc_nonet_for_doc_build	2011-12-08 08:14:46 UTC (rev 8831)
@@ -2,9 +2,9 @@
 # This magically works if docbook-xsl is installed, otherwise it fails
 # complaining that it needs to access http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
 
---- a/doc/docbook/Makefile.in
-+++ b/doc/docbook/Makefile.in
-@@ -385,12 +385,12 @@
+--- mira-3.4.0.1.orig/doc/docbook/Makefile.in
++++ mira-3.4.0.1/doc/docbook/Makefile.in
+@@ -387,12 +387,12 @@
  
  %_part.html: %_part.xml
  	@echo "Making .html out of _part.xml" $@