[med-svn] r19277 - in trunk/packages/theseus/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-05-21 13:25:20 +0000 (Thu, 21 May 2015)
New Revision: 19277

Modified:
   trunk/packages/theseus/trunk/debian/changelog
   trunk/packages/theseus/trunk/debian/control
   trunk/packages/theseus/trunk/debian/patches/30_fix_gcc_options.patch
Log:
New upstream version


Modified: trunk/packages/theseus/trunk/debian/changelog
===================================================================
--- trunk/packages/theseus/trunk/debian/changelog	2015-05-21 07:54:56 UTC (rev 19276)
+++ trunk/packages/theseus/trunk/debian/changelog	2015-05-21 13:25:20 UTC (rev 19277)
@@ -1,3 +1,10 @@
+theseus (3.1.1-1) unstable; urgency=medium
+
+  * New upstream version
+  * cme fix dpkg-control
+
+ -- Andreas Tille <tille at debian.org>  Thu, 21 May 2015 14:26:30 +0200
+
 theseus (3.0.0-1) unstable; urgency=medium
 
   * New upstream version

Modified: trunk/packages/theseus/trunk/debian/control
===================================================================
--- trunk/packages/theseus/trunk/debian/control	2015-05-21 07:54:56 UTC (rev 19276)
+++ trunk/packages/theseus/trunk/debian/control	2015-05-21 13:25:20 UTC (rev 19277)
@@ -6,7 +6,7 @@
 Priority: optional
 Build-Depends: debhelper (>= 9),
                libgsl0-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/theseus/trunk
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/theseus/trunk/
 Homepage: http://www.theseus3d.org

Modified: trunk/packages/theseus/trunk/debian/patches/30_fix_gcc_options.patch
===================================================================
--- trunk/packages/theseus/trunk/debian/patches/30_fix_gcc_options.patch	2015-05-21 07:54:56 UTC (rev 19276)
+++ trunk/packages/theseus/trunk/debian/patches/30_fix_gcc_options.patch	2015-05-21 13:25:20 UTC (rev 19277)
@@ -6,24 +6,22 @@
 
 --- a/make.inc
 +++ b/make.inc
-@@ -6,12 +6,12 @@
- RANLIB    = ranlib
+@@ -3,10 +3,10 @@
+ #  If you system has no ranlib, set RANLIB = echo.
+ #
  
- # for universal OSX binary
 -ARCH = libtool
--ARCHFLAGS = -static -o
-+# ARCH = libtool
-+# ARCHFLAGS = -static -o
- 
- # for normal arch-native tuned OSX binary
--# ARCH      = ar
--# ARCHFLAGS = -rvs
+-ARCHFLAGS = -o
+-#ARCH      = ar
+-#ARCHFLAGS = -rvs
++#ARCH = libtool
++#ARCHFLAGS = -o
 +ARCH      = ar
 +ARCHFLAGS = -rvs
+ RANLIB    = ranlib
  
  #MACOSX_DEPLOYMENT_TARGET=10.4
- #export MACOSX_DEPLOYMENT_TARGET
-@@ -38,7 +38,7 @@ ARCHFLAGS = -static -o
+@@ -49,7 +49,7 @@ RANLIB    = ranlib
  # Mac OSX Universal
  #
  LOCALLIBDIR = /usr/local/lib
@@ -32,27 +30,27 @@
  SYSLIBS = -lpthread -lgsl -lgslcblas -lm -lc
  LIBDIR = -L./lib
  INSTALLDIR = /usr/local/bin
-@@ -46,7 +46,7 @@ INSTALLDIR = /usr/local/bin
- OPT = -O3 -ffast-math #-fstrict-aliasing -funroll-loops -fomit-frame-pointer
+@@ -57,7 +57,7 @@ INSTALLDIR = /usr/local/bin
+ OPT = -O3 -ffast-math -fstrict-aliasing -funroll-loops -fomit-frame-pointer
  #WARN = -Werror -Wno-error=unused-result -Wall -pedantic -std=c99
  WARN = -Werror -Wall -pedantic -std=c99 # for APPLE MACOSX
 -CFLAGS += $(WARN) -force_cpusubtype_ALL -mmacosx-version-min=10.4 -arch x86_64 -arch i386 #-DNDEBUG
 +#CFLAGS += $(WARN) -force_cpusubtype_ALL -mmacosx-version-min=10.4 -arch x86_64 -arch i386 #-DNDEBUG
+ #CFLAGS += $(WARN)
  # CPPFLAGS are ignored by the rest of the build system but necessary for hardening flags
  CFLAGS += $(CPPFLAGS)
- # Filter out -O2 which overwrites the default -O3 because OPT is used before CFLAGS
-@@ -65,11 +65,11 @@ CC = gcc
- # LIBDIR = -L./lib/ -L/usr/lib/
- # INCDIR = -I/usr/local/include/
- # INSTALLDIR = /usr/local/bin
--# OPT = -O3 -ffast-math -fstrict-aliasing -funroll-loops -fomit-frame-pointer
+@@ -77,11 +77,11 @@ CC = /usr/bin/gcc
+ #LIBDIR = -L./lib/ -L/usr/lib/
+ #INCDIR = -I/usr/local/include/
+ #INSTALLDIR = /usr/local/bin
+-##OPT = -O3 -ffast-math -fstrict-aliasing -funroll-loops -fomit-frame-pointer -mtune=native
 +OPT = -O3 -ffast-math -fstrict-aliasing -funroll-loops -fomit-frame-pointer
- # # OPT = -m64 -O3 -march=native -funroll-loops -ffast-math -mfpmath=sse
- # #OPT = -O0 -ggdb
--# WARN = -Wall -pedantic -std=c99 -Wno-unused-result
--# CFLAGS = $(WARN) -pthread
-+WARN = -Wall -pedantic -std=c99 -Wno-unused-result
-+CFLAGS += $(WARN) -pthread
- # CC = gcc
+ ## OPT = -m64 -O3 -march=native -funroll-loops -ffast-math -mfpmath=sse
+ #OPT = -O0 -ggdb
+-#WARN = -Wall -Werror -pedantic -std=c99 -Wno-unused-result
+-#CFLAGS = $(WARN) -pthread
++WARN = -Wall -Werror -pedantic -std=c99 -Wno-unused-result
++CFLAGS = $(WARN) -pthread
+ #CC = /usr/local/bin/gcc