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

[Andreas Tille]

Author: tille
Date: 2009-09-07 13:56:33 +0000 (Mon, 07 Sep 2009)
New Revision: 3918

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
Log:
Build-Depends: xutils-dev, Enable building with gcc 4.3.4


Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog	2009-09-07 12:15:07 UTC (rev 3917)
+++ trunk/packages/arb/trunk/debian/changelog	2009-09-07 13:56:33 UTC (rev 3918)
@@ -11,6 +11,7 @@
     - debian/patches/ARB_release200712_gcc4.3.1.patch removed
     - debian/patches/20_replace_rxp_by_xmllint.patch removed
     - debian/patches/tmpfile_CVE-2008-5378.patch removed applied part
+  * Build-Depends: xutils-dev
 
   [ David Paleino ]
   * Removed myself from Uploaders

Modified: trunk/packages/arb/trunk/debian/control
===================================================================
--- trunk/packages/arb/trunk/debian/control	2009-09-07 12:15:07 UTC (rev 3917)
+++ trunk/packages/arb/trunk/debian/control	2009-09-07 13:56:33 UTC (rev 3918)
@@ -7,7 +7,7 @@
 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,
  freeglut3-dev | libglu-dev, libglew1.5-dev, libpng12-dev, x11proto-print-dev,
- libxpm-dev, libxp-dev, libglw1-mesa-dev, perl-doc, chrpath
+ libxpm-dev, libxp-dev, libglw1-mesa-dev, perl-doc, chrpath, xutils-dev
 Standards-Version: 3.8.3
 Homepage: http://www.arb-home.de/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/arb/trunk/?rev=0&sc=0

Modified: trunk/packages/arb/trunk/debian/patches/20_Makefiles
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_Makefiles	2009-09-07 12:15:07 UTC (rev 3917)
+++ trunk/packages/arb/trunk/debian/patches/20_Makefiles	2009-09-07 13:56:33 UTC (rev 3918)
@@ -30,17 +30,9 @@
  OBJECTS = $(GB_O) $(GB_T) $(GB_PP) $(GB_X)
 --- arbsrc_6182.orig/NAMES_COM/Makefile
 +++ arbsrc_6182/NAMES_COM/Makefile
-@@ -21,13 +21,13 @@
- include AISC/export2sub
+@@ -27,7 +27,7 @@
+ 	@$(MAKE) -r -f AISC/Makefile pregenerate
  
- server.a: $(MAIN_SOURCE) $(PRIVATE_SERVER_OBJECTS:.o=.c) $(PUBLIC_SOURCES) $(AISC_DEPENDS)
--	@$(MAKE) -r -f AISC/Makefile
-+	@$(MAKE) -r -f ../AISC/Makefile
- 
- depends:
--	@$(MAKE) -r -f AISC/Makefile pregenerate
-+	@$(MAKE) -r -f ../AISC/Makefile pregenerate
- 
  clean:
 -	@$(MAKE) -r -f AISC/Makefile clean
 +	@$(MAKE) -r -f ../AISC/Makefile clean

Modified: trunk/packages/arb/trunk/debian/patches/30_Makefile_main
===================================================================
--- trunk/packages/arb/trunk/debian/patches/30_Makefile_main	2009-09-07 12:15:07 UTC (rev 3917)
+++ trunk/packages/arb/trunk/debian/patches/30_Makefile_main	2009-09-07 13:56:33 UTC (rev 3918)
@@ -1,5 +1,14 @@
 --- arbsrc_6182.orig/Makefile
 +++ arbsrc_6182/Makefile
+@@ -57,7 +57,7 @@
+ 	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 \
+ 
+ ALLOWED_GCC_VERSIONS=$(ALLOWED_GCC_3xx_VERSIONS) $(ALLOWED_GCC_4xx_VERSIONS)
+ 
 @@ -85,7 +85,7 @@
  endif