[med-svn] r11007 - in trunk/packages/libhmsbeagle/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-05-25 12:48:02 +0000 (Fri, 25 May 2012)
New Revision: 11007

Added:
   trunk/packages/libhmsbeagle/trunk/debian/patches/do_not_build_unused_plugin.patch
Modified:
   trunk/packages/libhmsbeagle/trunk/debian/changelog
   trunk/packages/libhmsbeagle/trunk/debian/patches/enable_static.patch
   trunk/packages/libhmsbeagle/trunk/debian/patches/series
Log:
Override unconfirmed NMU with current changes in SVN; upgrade to new version needs more communication with upstream and is thus delayed; also delayed hardening


Modified: trunk/packages/libhmsbeagle/trunk/debian/changelog
===================================================================
--- trunk/packages/libhmsbeagle/trunk/debian/changelog	2012-05-25 12:29:48 UTC (rev 11006)
+++ trunk/packages/libhmsbeagle/trunk/debian/changelog	2012-05-25 12:48:02 UTC (rev 11007)
@@ -1,9 +1,5 @@
-libhmsbeagle (1.1-1) UNRELEASED; urgency=low
+libhmsbeagle (1.0-6) unstable; urgency=low
 
-  * New upstream release
-     - debian/patches/disable_cpu_sse_plugin.patch:  Seems upstream
-       has solved the problem a bit differently than in this patch
-       -> droping it for the moment
   * debian/upstream:
      - Make authors BibTeX compliant
      - Add some publication info (volume, number, pages)

Added: trunk/packages/libhmsbeagle/trunk/debian/patches/do_not_build_unused_plugin.patch
===================================================================
--- trunk/packages/libhmsbeagle/trunk/debian/patches/do_not_build_unused_plugin.patch	                        (rev 0)
+++ trunk/packages/libhmsbeagle/trunk/debian/patches/do_not_build_unused_plugin.patch	2012-05-25 12:48:02 UTC (rev 11007)
@@ -0,0 +1,31 @@
+Author: Andreas Tille <tille at debian.org>
+Bug-Closed: http://bugs.debian.org/656755
+Date: Sat, 21 Jan 2012 17:27:53 +0100
+Description: According to the bug reporter the plugin causes
+ trouble on all architectures but amd64.  Because this plugin
+ is finally not used at all the building will be simply
+ suppressed
+
+That's too simple and does not work - it results in
+
+../../libhmsbeagle/.libs/libhmsbeagle.so: undefined reference to `beagle::plugin::PluginManager::instance()'
+../../libhmsbeagle/.libs/libhmsbeagle.so: undefined reference to `beagle::plugin::PluginManager::findPlugin(char const*)'
+
+
+--- libhmsbeagle-1.0.orig/libhmsbeagle/Makefile.am
++++ libhmsbeagle-1.0/libhmsbeagle/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS=GPU CPU plugin
++SUBDIRS=GPU CPU
+ if BUILDJNI
+ lib_LTLIBRARIES=libhmsbeagle.la libhmsbeagle-jni.la
+ else
+@@ -6,7 +6,7 @@
+ endif
+ 
+ libhmsbeagle_la_SOURCES=beagle.cpp BeagleImpl.h
+-libhmsbeagle_la_LIBADD = plugin/libplugin.la
++# libhmsbeagle_la_LIBADD = plugin/libplugin.la
+ libhmsbeagle_la_CXXFLAGS = $(AM_CXXFLAGS)
+ libhmsbeagle_la_LDFLAGS= -version-info $(GENERIC_LIBRARY_VERSION)
+ 

Modified: trunk/packages/libhmsbeagle/trunk/debian/patches/enable_static.patch
===================================================================
--- trunk/packages/libhmsbeagle/trunk/debian/patches/enable_static.patch	2012-05-25 12:29:48 UTC (rev 11006)
+++ trunk/packages/libhmsbeagle/trunk/debian/patches/enable_static.patch	2012-05-25 12:48:02 UTC (rev 11007)
@@ -2,8 +2,8 @@
 Date: Sat, 21 Jan 2012 17:27:53 +0100
 Description: Enable building static libraries for the -dev package
 
---- libhmsbeagle-1.1.orig/configure.ac
-+++ libhmsbeagle-1.1/configure.ac
+--- libhmsbeagle-1.0.orig/configure.ac
++++ libhmsbeagle-1.0/configure.ac
 @@ -59,8 +59,8 @@
  AC_PROG_CXX
  AC_PROG_INSTALL

Modified: trunk/packages/libhmsbeagle/trunk/debian/patches/series
===================================================================
--- trunk/packages/libhmsbeagle/trunk/debian/patches/series	2012-05-25 12:29:48 UTC (rev 11006)
+++ trunk/packages/libhmsbeagle/trunk/debian/patches/series	2012-05-25 12:48:02 UTC (rev 11007)
@@ -1 +1,3 @@
 enable_static.patch
+disable_cpu_sse_plugin.patch
+gcc-4.7.patch