[med-svn] r17594 - in trunk/packages/arb/trunk/debian: . patches

Fri Aug 1 11:13:02 UTC 2014

Author: epruesse-guest
Date: 2014-08-01 11:13:02 +0000 (Fri, 01 Aug 2014)
New Revision: 17594

Removed:
   trunk/packages/arb/trunk/debian/patches/40_add_libGLU.patch
   trunk/packages/arb/trunk/debian/patches/80_no_GL.patch
Modified:
   trunk/packages/arb/trunk/debian/arb-common.install
   trunk/packages/arb/trunk/debian/patches/10_config.makefiles.patch
   trunk/packages/arb/trunk/debian/patches/series
   trunk/packages/arb/trunk/debian/rules
Log:
fix build problems


Modified: trunk/packages/arb/trunk/debian/arb-common.install
===================================================================

--- trunk/packages/arb/trunk/debian/arb-common.install	2014-08-01 10:53:48 UTC (rev 17593)
+++ trunk/packages/arb/trunk/debian/arb-common.install	2014-08-01 11:13:02 UTC (rev 17594)
@@ -1,5 +1,3 @@
-GDEHELP/ARB_GDEmenus                  etc/arb
-GDEHELP/DATA_FILES                    usr/lib/arb/GDEHELP
 HELP_SOURCE/oldhelp/*.hlp             usr/lib/arb/HELP_SOURCE/oldhelp
 HELP_SOURCE/oldhelp/prompt            usr/lib/arb/HELP_SOURCE/oldhelp
 PERL2ARB/ARB.pm                       usr/lib/arb/lib

Modified: trunk/packages/arb/trunk/debian/patches/10_config.makefiles.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/10_config.makefiles.patch	2014-08-01 10:53:48 UTC (rev 17593)
+++ trunk/packages/arb/trunk/debian/patches/10_config.makefiles.patch	2014-08-01 11:13:02 UTC (rev 17594)
@@ -1,8 +1,10 @@
 Author: Andreas Tille <tille at debian.org>
 Description: Set basic makefile configuration variables
 
---- /dev/null
-+++ b/config.makefile
+Index: arbsrc_12565/config.makefile
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ arbsrc_12565/config.makefile	2014-08-01 10:37:21.788971144 +0200
 @@ -0,0 +1,27 @@
 +# --------------------------------------------------------------------------------
 +# If this file is named config.makefile.template then copy it to config.makefile
@@ -15,7 +17,7 @@
 +DEBUG=0# build with debug information
 +DEBUG_GRAPHICS = 0# force instant graphic update
 +# SEER = 1
-+OPENGL=1
++OPENGL=0
 +# ARB_64=0# compile on 64 bit machine (has no effect yet)
 +ARB_64 := $(shell if [ `dpkg-architecture -qDEB_BUILD_ARCH_BITS` -eq 64 ] ; then echo 1 ; else echo 0 ; fi)
 +

Deleted: trunk/packages/arb/trunk/debian/patches/40_add_libGLU.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/40_add_libGLU.patch	2014-08-01 10:53:48 UTC (rev 17593)
+++ trunk/packages/arb/trunk/debian/patches/40_add_libGLU.patch	2014-08-01 11:13:02 UTC (rev 17594)
@@ -1,17 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Mon, 28 Jul 2014 15:35:40 +0200
-Description: Add missing libGLU
-
---- a/Makefile
-+++ b/Makefile
-@@ -968,8 +968,8 @@ ARCHS_NTREE = \
- $(NTREE): $(ARCHS_NTREE:.a=.dummy) link_awt
- 	@SOURCE_TOOLS/binuptodate.pl $@ $(ARCHS_NTREE) $(GUI_LIBS) $(use_ARB_main) || ( \
- 		echo "$(SEP) Link $@"; \
--		echo "$(LINK_EXECUTABLE) $@ $(use_ARB_main) $(LIBPATH) $(ARCHS_NTREE) $(ARCHS_CLIENT_PROBE) $(GUI_LIBS) $(EXECLIBS)" ; \
--		$(LINK_EXECUTABLE) $@ $(use_ARB_main) $(LIBPATH) $(ARCHS_NTREE) $(ARCHS_CLIENT_PROBE) $(GUI_LIBS) $(EXECLIBS) && \
-+		echo "$(LINK_EXECUTABLE) $@ $(use_ARB_main) $(LIBPATH) $(ARCHS_NTREE) $(ARCHS_CLIENT_PROBE) $(GUI_LIBS) -lGLU $(EXECLIBS)" ; \
-+		$(LINK_EXECUTABLE) $@ $(use_ARB_main) $(LIBPATH) $(ARCHS_NTREE) $(ARCHS_CLIENT_PROBE) $(GUI_LIBS) -lGLU $(EXECLIBS) && \
- 		echo "$(SEP) Link $@ [done]"; \
- 		)
- 

Deleted: trunk/packages/arb/trunk/debian/patches/80_no_GL.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/80_no_GL.patch	2014-08-01 10:53:48 UTC (rev 17593)
+++ trunk/packages/arb/trunk/debian/patches/80_no_GL.patch	2014-08-01 11:13:02 UTC (rev 17594)
@@ -1,16 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Mon, 28 Jul 2014 14:36:39 +0200
-Description: Switch of GL for the moment since it generates build errors
- Hopefully this patch can be deactivated by fixing the GL build problems
- 
---- a/config.makefile
-+++ b/config.makefile
-@@ -9,7 +9,7 @@ DEVELOPER=ANY
- DEBUG=0# build with debug information
- DEBUG_GRAPHICS = 0# force instant graphic update
- # SEER = 1
--OPENGL=1
-+OPENGL=0
- # ARB_64=0# compile on 64 bit machine (has no effect yet)
- ARB_64 := $(shell if [ `dpkg-architecture -qDEB_BUILD_ARCH_BITS` -eq 64 ] ; then echo 1 ; else echo 0 ; fi)
- 

Modified: trunk/packages/arb/trunk/debian/patches/series
===================================================================
--- trunk/packages/arb/trunk/debian/patches/series	2014-08-01 10:53:48 UTC (rev 17593)
+++ trunk/packages/arb/trunk/debian/patches/series	2014-08-01 11:13:02 UTC (rev 17594)
@@ -2,8 +2,6 @@
 20_Makefile_main.patch
 21_Makefiles.patch
 30_tmpfile_CVE-2008-5378.patch
-40_add_libGLU.patch
 50_fix_gcc-4.8.patch
 60_use_debian_packaged_raxml.patch
 70_hardening.patch
-80_no_GL.patch

Modified: trunk/packages/arb/trunk/debian/rules
===================================================================
--- trunk/packages/arb/trunk/debian/rules	2014-08-01 10:53:48 UTC (rev 17593)
+++ trunk/packages/arb/trunk/debian/rules	2014-08-01 11:13:02 UTC (rev 17594)
@@ -49,8 +49,9 @@
 			 GDE/MOLPHY/prot_tml.h \
 			 PERL2ARB/perlmain.c \
 			 PERL2ARB/ARB.bs PERL_SCRIPTS/test/test.stamp PERL2ARB/MYMETA.yml
-FILESTOREMOVE=libXm.so.3 NALIGNER/NALIGNER.com lib/nas/names.dat $(RemoveFromSourceAndBuild)
-DIRSTOREMOVE=INCLUDE HELP_SOURCE/Xml lib/help lib/help_html PERL5 lib/perl5 PROBE_SERVER/bin PERL2ARB/blib/man3 PROBE_SET/bin
+FILESTOREMOVE=libXm.so.3 NALIGNER/NALIGNER.com lib/nas/names.dat $(RemoveFromSourceAndBuild) \
+     GDE/PHYML20130708/phyml/config.h.in GDE/PHYML20130708/phyml/configure
+DIRSTOREMOVE=INCLUDE HELP_SOURCE/Xml lib/help lib/help_html PERL5 lib/perl5 PROBE_SERVER/bin PERL2ARB/blib/man3 PROBE_SET/bin NAMES_COM/DUMP PROBE_COM/DUMP
 DirsToKeepOnlyMAKEFILE=bin
 
 override_dh_auto_clean:


