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

Andreas Tille tille at alioth.debian.org
Tue Mar 23 14:31:38 UTC 2010 

Author: tille
Date: 2010-03-23 14:31:37 +0000 (Tue, 23 Mar 2010)
New Revision: 4675

Modified:
   trunk/packages/arb/trunk/debian/changelog
   trunk/packages/arb/trunk/debian/control
   trunk/packages/arb/trunk/debian/patches/20_Makefiles
   trunk/packages/arb/trunk/debian/patches/30_Makefile_main
   trunk/packages/arb/trunk/debian/patches/series
Log:
Some patches to enable compilation using gcc-4.4.3 (does not finally build but I'm working on this)


Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog	2010-03-22 14:52:19 UTC (rev 4674)
+++ trunk/packages/arb/trunk/debian/changelog	2010-03-23 14:31:37 UTC (rev 4675)
@@ -1,16 +1,18 @@
-arb (5.0-1) UNRELEASED; urgency=low
+arb (5.1-1) UNRELEASED; urgency=low
 
   [ Andreas Tille ]
   * New upstream version
     Closes: #522021
   * debian/control:
     - Package arb-doc in non-free/doc
-    - Standards-Version: 3.8.3 (Added README.source)
+    - Standards-Version: 3.8.4 (Added README.source)
     - Build-Depends: dpkg-dev (>= 1.15.4) to make use of
       `dpkg-architecture -qDEB_BUILD_ARCH_BITS` in Makefile
     - Build-Depends: xutils-dev
     - arb Recommends: bioperl
     - arb Suggests: phyml
+    - Build-Depends: openjdk-6-jdk instead of kaffe which might be subject
+      of removal from Debian in the near future
   * Removed / changed patches which were applied upstream
     - debian/patches/ARB_release200712_gcc4.3.1.patch removed
     - debian/patches/20_replace_rxp_by_xmllint.patch removed
@@ -19,12 +21,13 @@
   * debian/arb.README.debian:
     - Removed useless warning about prereleases
     - Added hint about different phyml versions
+  * debian/patches/10_gcc_4.4.3.patch: compile with gcc-4.4.3
 
   [ David Paleino ]
   * Removed myself from Uploaders
   * New watch file
 
- -- Andreas Tille <tille at debian.org>  Mon, 07 Sep 2009 11:44:52 +0200
+ -- Andreas Tille <tille at debian.org>  Tue, 23 Mar 2010 14:37:30 +0100
 
 arb (0.0.20071207.1-7) unstable; urgency=low
 

Modified: trunk/packages/arb/trunk/debian/control
===================================================================
--- trunk/packages/arb/trunk/debian/control	2010-03-22 14:52:19 UTC (rev 4674)
+++ trunk/packages/arb/trunk/debian/control	2010-03-23 14:31:37 UTC (rev 4675)
@@ -4,11 +4,11 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: dpkg-dev (>= 1.15.4), debhelper (>= 7.1), quilt, libmotif-dev, xviewg-dev,
- libxml2-utils, lynx, sablotron, libtiff4-dev, libxaw7-dev, kaffe | free-java-sdk,
+Build-Depends: dpkg-dev (>= 1.15.4), debhelper (>= 7.1), quilt,
+ libxml2-utils, lynx, sablotron, libtiff4-dev, libxaw7-dev, openjdk-6-jdk | default-jdk,
  freeglut3-dev | libglu-dev, libglew1.5-dev, libpng12-dev, x11proto-print-dev,
- libxpm-dev, libxp-dev, libglw1-mesa-dev, perl-doc, chrpath, xutils-dev
-Standards-Version: 3.8.3
+ libxpm-dev, libxp-dev, libglw1-mesa-dev, perl-doc, chrpath, xutils-dev, libmotif-dev
+Standards-Version: 3.8.4
 Homepage: http://www.arb-home.de/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/arb/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/arb/trunk/

Modified: trunk/packages/arb/trunk/debian/patches/20_Makefiles
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_Makefiles	2010-03-22 14:52:19 UTC (rev 4674)
+++ trunk/packages/arb/trunk/debian/patches/20_Makefiles	2010-03-23 14:31:37 UTC (rev 4675)
@@ -1,5 +1,5 @@
---- arbsrc_6182.orig/ARBDB2/Makefile
-+++ arbsrc_6182/ARBDB2/Makefile
+--- arb-5.0.orig/ARBDB2/Makefile
++++ arb-5.0/ARBDB2/Makefile
 @@ -1,7 +1,11 @@
  # INCLUDE und GLOBALS MAIN CC cflags werden von aussen uebergeben
  .SUFFIXES: .o .c .depend
@@ -13,8 +13,8 @@
  
  ACC_OBJECTS = $(GB_O) $(GB_T) $(GB_X)
  
---- arbsrc_6182.orig/ARBDBS/Makefile
-+++ arbsrc_6182/ARBDBS/Makefile
+--- arb-5.0.orig/ARBDBS/Makefile
++++ arb-5.0/ARBDBS/Makefile
 @@ -1,7 +1,11 @@
  # INCLUDE und GLOBALS MAIN CC cflags werden von aussen uebergeben
  .SUFFIXES: .o .c .cxx .depend
@@ -28,8 +28,8 @@
  
  
  OBJECTS = $(GB_O) $(GB_T) $(GB_PP) $(GB_X)
---- arbsrc_6182.orig/NAMES_COM/Makefile
-+++ arbsrc_6182/NAMES_COM/Makefile
+--- arb-5.0.orig/NAMES_COM/Makefile
++++ arb-5.0/NAMES_COM/Makefile
 @@ -27,7 +27,7 @@
  	@$(MAKE) -r -f AISC/Makefile pregenerate
  
@@ -39,8 +39,8 @@
  
  # DO NOT DELETE
  
---- arbsrc_6182.orig/PROBE_COM/Makefile
-+++ arbsrc_6182/PROBE_COM/Makefile
+--- arb-5.0.orig/PROBE_COM/Makefile
++++ arb-5.0/PROBE_COM/Makefile
 @@ -27,7 +27,7 @@
  		@$(MAKE) -r -f AISC/Makefile pregenerate
  
@@ -50,3 +50,24 @@
  
  # DO NOT DELETE
  
+--- arb-5.0.orig/GENOM_IMPORT/Makefile
++++ arb-5.0/GENOM_IMPORT/Makefile
+@@ -30,12 +30,12 @@
+ 	$(ACC) $(cflags) -c $< $(CPPINCLUDES)
+ 
+ clean:
+-	-rm *.o
+-	-rm *.a
+-	-rm *.bak
+-	-rm *~
+-	-rm *#
+-	-rm *\%
++	-rm -f *.o
++	-rm -f *.a
++	-rm -f *.bak
++	-rm -f *~
++	-rm -f *#
++	-rm -f *\%
+ 
+ #.IGNORE:
+ #	clean

Modified: trunk/packages/arb/trunk/debian/patches/30_Makefile_main
===================================================================
--- trunk/packages/arb/trunk/debian/patches/30_Makefile_main	2010-03-22 14:52:19 UTC (rev 4674)
+++ trunk/packages/arb/trunk/debian/patches/30_Makefile_main	2010-03-23 14:31:37 UTC (rev 4675)
@@ -1,15 +1,16 @@
---- arbsrc_6182.orig/Makefile
-+++ arbsrc_6182/Makefile
-@@ -57,7 +57,7 @@
+--- arb-5.0.orig/Makefile
++++ arb-5.0/Makefile
+@@ -57,7 +57,8 @@
  	4.0.0 4.0.1 4.0.2 4.0.3 \
  	4.1.1 4.1.2 4.1.3 \
  	4.2.0 4.2.1 4.2.3 4.2.4 \
 -	4.3 4.3.1 4.3.2 4.3.3 \
 +	4.3 4.3.1 4.3.2 4.3.3 4.3.4 \
++	4.4.3 \
  
  ALLOWED_GCC_VERSIONS=$(ALLOWED_GCC_3xx_VERSIONS) $(ALLOWED_GCC_4xx_VERSIONS)
  
-@@ -85,7 +85,8 @@
+@@ -85,7 +86,8 @@
  endif
  
  shared_cflags :=# flags for shared lib compilation
@@ -19,3 +20,12 @@
  extended_warnings :=# warning flags for C and C++-compiler
  extended_cpp_warnings :=# warning flags for C++-compiler only
  
+@@ -198,7 +200,7 @@
+ 
+ #---------------------- X11 location
+ 
+-XHOME:=/usr/X11R6
++XHOME:=/usr
+ XINCLUDES:=-I$(XHOME)/include
+ 
+ ifdef DARWIN

Modified: trunk/packages/arb/trunk/debian/patches/series
===================================================================
--- trunk/packages/arb/trunk/debian/patches/series	2010-03-22 14:52:19 UTC (rev 4674)
+++ trunk/packages/arb/trunk/debian/patches/series	2010-03-23 14:31:37 UTC (rev 4675)
@@ -4,3 +4,4 @@
 20_Makefiles
 20_tmpfile_issue.patch
 tmpfile_CVE-2008-5378.patch
+10_gcc_4.4.3.patch

More information about the debian-med-commit mailing list