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

[Andreas Tille]

Author: tille
Date: 2011-12-09 08:08:32 +0000 (Fri, 09 Dec 2011)
New Revision: 8862

Removed:
   trunk/packages/mira/trunk/debian/patches/fix_duplicate_bposhashstat_t_definition.patch
   trunk/packages/mira/trunk/debian/patches/read_default_constructor.patch
Modified:
   trunk/packages/mira/trunk/debian/changelog
   trunk/packages/mira/trunk/debian/patches/series
Log:
Remove the really stupid patch from yesterday that exactly removes what the previous patch was introducing.


Modified: trunk/packages/mira/trunk/debian/changelog
===================================================================
--- trunk/packages/mira/trunk/debian/changelog	2011-12-09 07:48:10 UTC (rev 8861)
+++ trunk/packages/mira/trunk/debian/changelog	2011-12-09 08:08:32 UTC (rev 8862)
@@ -1,3 +1,13 @@
+mira (3.4.0.1-2) UNRELEASED; urgency=low
+
+  * Remove two patches:
+    - read_default_constructor.patch which introduces a duplicate
+      bposhashstat_t() definition
+    - fix_duplicate_bposhashstat_t_definition.patch which removes
+      this duplicate afterwards
+
+ -- Andreas Tille <tille at debian.org>  Fri, 09 Dec 2011 09:05:53 +0100
+
 mira (3.4.0.1-1) unstable; urgency=low
 
   * New upstream version

Deleted: trunk/packages/mira/trunk/debian/patches/fix_duplicate_bposhashstat_t_definition.patch
===================================================================
--- trunk/packages/mira/trunk/debian/patches/fix_duplicate_bposhashstat_t_definition.patch	2011-12-09 07:48:10 UTC (rev 8861)
+++ trunk/packages/mira/trunk/debian/patches/fix_duplicate_bposhashstat_t_definition.patch	2011-12-09 08:08:32 UTC (rev 8862)
@@ -1,15 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Date: Thu, 08 Dec 2011 08:50:19 +0100
-Description: Remove duplicate defintion of bposhashstat_t()
---- mira-3.4.0.1.orig/src/mira/read.H
-+++ mira-3.4.0.1/src/mira/read.H
-@@ -216,9 +216,6 @@
-       return ostr;
-     }
- 
--    bposhashstat_t () {
--    }
--    
-   };
-   
-   

Deleted: trunk/packages/mira/trunk/debian/patches/read_default_constructor.patch
===================================================================
--- trunk/packages/mira/trunk/debian/patches/read_default_constructor.patch	2011-12-09 07:48:10 UTC (rev 8861)
+++ trunk/packages/mira/trunk/debian/patches/read_default_constructor.patch	2011-12-09 08:08:32 UTC (rev 8862)
@@ -1,20 +0,0 @@
-# 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
---- 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;
-     }
-+
-+    bposhashstat_t () {
-+    }
-+    
-   };
-   
-   

Modified: trunk/packages/mira/trunk/debian/patches/series
===================================================================
--- trunk/packages/mira/trunk/debian/patches/series	2011-12-09 07:48:10 UTC (rev 8861)
+++ trunk/packages/mira/trunk/debian/patches/series	2011-12-09 08:08:32 UTC (rev 8862)
@@ -1,4 +1,2 @@
 add_shebang_lines
 xsltproc_nonet_for_doc_build
-read_default_constructor.patch
-fix_duplicate_bposhashstat_t_definition.patch