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

[tille at alioth.debian.org]

Author: tille
Date: 2008-07-07 10:06:13 +0000 (Mon, 07 Jul 2008)
New Revision: 2177

Modified:
   trunk/packages/arb/trunk/debian/changelog
   trunk/packages/arb/trunk/debian/control
   trunk/packages/arb/trunk/debian/patches/30_Makefile_main
   trunk/packages/arb/trunk/debian/patches/series
   trunk/packages/arb/trunk/debian/rules
Log:
Fixes #489330, but reviealed a lot of gcc-4.3 issues - I'm working on these ...


Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog	2008-07-07 04:28:01 UTC (rev 2176)
+++ trunk/packages/arb/trunk/debian/changelog	2008-07-07 10:06:13 UTC (rev 2177)
@@ -1,9 +1,16 @@
-arb (0.0.20071207.1-3) UNRELEASED; urgency=low
+arb (0.0.20071207.1-3) unstable; urgency=low
 
+  [ Charles Plessy ]
   * Changed the doc-base section according to the new policy.
 
- -- Charles Plessy <charles-debian-nospam at plessy.org>  Sat, 22 Mar 2008 11:29:29 +0900
+  [ Andreas Tille ]
+  * Updated dependency from libglew (Build-Depends: libglew-dev -> libglew1.5-dev)
+    Closes: #489330
+  * Standards-Version: 3.8.0 (no changes needed)
+  * debian/patches/30_Makefile_main: Enable gcc-4.3
 
+ -- Andreas Tille <tille at debian.org>  Mon, 07 Jul 2008 09:11:40 +0200
+
 arb (0.0.20071207.1-2) unstable; urgency=low
 
   * Added XS-Autobuild: yes to enable autobuilding

Modified: trunk/packages/arb/trunk/debian/control
===================================================================
--- trunk/packages/arb/trunk/debian/control	2008-07-07 04:28:01 UTC (rev 2176)
+++ trunk/packages/arb/trunk/debian/control	2008-07-07 10:06:13 UTC (rev 2177)
@@ -7,9 +7,9 @@
  David Paleino <d.paleino at gmail.com>
 Build-Depends: debhelper (>= 5.0), quilt, libmotif-dev, xviewg-dev,
  rxp, lynx, sablotron, libtiff4-dev, libxaw7-dev, kaffe | free-java-sdk,
- freeglut3-dev | libglu-dev, libglew-dev, libpng12-dev, x11proto-print-dev,
+ freeglut3-dev | libglu-dev, libglew1.5-dev, libpng12-dev, x11proto-print-dev,
  libxpm-dev, libxp-dev, libglw1-mesa-dev, perl-doc
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 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/30_Makefile_main
===================================================================
--- trunk/packages/arb/trunk/debian/patches/30_Makefile_main	2008-07-07 04:28:01 UTC (rev 2176)
+++ trunk/packages/arb/trunk/debian/patches/30_Makefile_main	2008-07-07 10:06:13 UTC (rev 2177)
@@ -9,6 +9,15 @@
  		fflags = $(dflag1) -C
  		extended_warnings         = -Wwrite-strings -Wunused -Wno-aggregate-return -Wshadow
  		extended_cpp_warnings     = -Wnon-virtual-dtor -Wreorder -Wpointer-arith 
+@@ -109,7 +109,7 @@
+ 
+ ALLOWED_GCC_295_VERSIONS=2.95.3
+ ALLOWED_GCC_3xx_VERSIONS=3.2 3.3.1 3.3.3 3.3.4 3.3.5 3.3.6 3.4.0 3.4.2 3.4.3
+-ALLOWED_GCC_4xx_VERSIONS=4.0.0 4.0.2 4.0.3 4.1.1 4.1.2 4.1.3 4.2.0 4.2.1 4.2.3
++ALLOWED_GCC_4xx_VERSIONS=4.0.0 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.3.1 4.3.2 4.3.3
+ ALLOWED_GCC_VERSIONS=$(ALLOWED_GCC_295_VERSIONS) $(ALLOWED_GCC_3xx_VERSIONS) $(ALLOWED_GCC_4xx_VERSIONS)
+ 
+ GCC_VERSION_FOUND=$(shell $(GCC) -dumpversion)
 @@ -133,6 +133,7 @@
  
  ifdef DEBIAN

Modified: trunk/packages/arb/trunk/debian/patches/series
===================================================================
--- trunk/packages/arb/trunk/debian/patches/series	2008-07-07 04:28:01 UTC (rev 2176)
+++ trunk/packages/arb/trunk/debian/patches/series	2008-07-07 10:06:13 UTC (rev 2177)
@@ -3,3 +3,4 @@
 20_config.makefiles
 30_Makefile_main
 20_Makefiles
+10_gcc4.3.patch

Modified: trunk/packages/arb/trunk/debian/rules
===================================================================
--- trunk/packages/arb/trunk/debian/rules	2008-07-07 04:28:01 UTC (rev 2176)
+++ trunk/packages/arb/trunk/debian/rules	2008-07-07 10:06:13 UTC (rev 2177)
@@ -38,6 +38,8 @@
 # The following subdirectorys where created at compile time in some directories
 # but will not be removed by clean target
 SUBDIRSTOREMOVE=GENC GENH O
+# Sometimes clean target does not work as expected.  Try to clean some dirs manually
+DIRSTOCLEAN=AISC AISC_MKPTPS SOURCE_TOOLS
 
 RemoveFromSourceAndBuild=PERL2ARB/Makefile PERL2ARB/ARB.c HELP_SOURCE/date.xsl \
                          lib/arb_tcp.dat lib/ARB.pm \
@@ -72,6 +74,7 @@
 	rm -f `find PROBE_WEB/CLIENT -name \*.jar -type f`
 	rm -f $(FILESTOREMOVE)
 	rm -fr $(DIRSTOREMOVE)
+	for dtc in $(DIRSTOCLEAN); do cd $${dtc}; make clean ; done
 
 	dh_clean build-stamp