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

[Andreas Tille]

Author: tille
Date: 2015-07-22 21:02:21 +0000 (Wed, 22 Jul 2015)
New Revision: 19688

Added:
   trunk/packages/arb/trunk/debian/patches/70_skip_compler_version_check.patch
Modified:
   trunk/packages/arb/trunk/debian/changelog
   trunk/packages/arb/trunk/debian/patches/series
Log:
Skip compiler version check at all


Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog	2015-07-21 15:55:34 UTC (rev 19687)
+++ trunk/packages/arb/trunk/debian/changelog	2015-07-22 21:02:21 UTC (rev 19688)
@@ -1,5 +1,6 @@
 arb (6.0.2-2) UNRELEASED; urgency=medium
 
+  [ Elmar Pruesse ]
    * Add Portugese debconf translation (thanks to Américo Monteiro 
      <a_monteiro at gmx.com> for the patch)
      Closes: #761503
@@ -8,8 +9,12 @@
      Closes: #761616
    * debian/arb_CHANGELOG.txt -> debian/changelog (fix lintian complaint)
 
- -- Elmar Pruesse <elmar at pruesse.net>  Tue, 16 Sep 2014 18:48:10 +0200
+  [ Andreas Tille ]
+  * Skip compiler version check at all
+    Closes: #793187
 
+ -- Andreas Tille <tille at debian.org>  Wed, 22 Jul 2015 22:45:32 +0200
+
 arb (6.0.2-1) unstable; urgency=medium
 
   [ Andreas Tille ]

Added: trunk/packages/arb/trunk/debian/patches/70_skip_compler_version_check.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/70_skip_compler_version_check.patch	                        (rev 0)
+++ trunk/packages/arb/trunk/debian/patches/70_skip_compler_version_check.patch	2015-07-22 21:02:21 UTC (rev 19688)
@@ -0,0 +1,32 @@
+Description: Skip compiler version check at all
+Author: Andreas Tille <tille at debian.org>
+Bug-Debian: http://bugs.debian.org/793187
+Last-Update: Wed, 22 Jul 2015 22:45:32 +0200
+
+--- a/Makefile
++++ b/Makefile
+@@ -736,23 +736,7 @@ check_same_GCC_VERSION:
+ 		$(ARBHOME)/SOURCE_TOOLS/check_same_compiler_version.pl $(COMPILER_NAME) $(COMPILER_VERSION_ALLOWED)
+ 
+ check_GCC_VERSION:
+-		@echo 'Compiler version check:'
+-ifeq ('$(COMPILER_VERSION_ALLOWED)', '')
+-		@echo "  - Your compiler is '$(COMPILER_NAME)' version '$(COMPILER_VERSION)'"
+-		@echo '    This version is not in the list of supported $(COMPILER_NAME)-versions:'
+-		@$(foreach version,$(ALLOWED_COMPILER_VERSIONS),echo '    * $(version)';)
+-		@echo '  - You may either ..'
+-		@echo '    - add your version to ALLOWED_$(COMPILER_NAME)_VERSIONS in the Makefile and try it out or'
+-		@echo '    - switch to one of the allowed versions (see arb_README_gcc.txt for installing'
+-		@echo '      a different version of gcc)'
+-		@echo ''
+-		@false
+-else
+-		@echo "  - Supported $(COMPILER_NAME) version '$(COMPILER_VERSION_ALLOWED)' detected - fine!"
+-		@echo ''
+-		$(MAKE) check_same_GCC_VERSION
+-
+-endif
++		@echo 'Skip compiler version check in Debian - we need to fix the code if it does not work'
+ 
+ #---------------------- check ARBHOME
+ 

Modified: trunk/packages/arb/trunk/debian/patches/series
===================================================================
--- trunk/packages/arb/trunk/debian/patches/series	2015-07-21 15:55:34 UTC (rev 19687)
+++ trunk/packages/arb/trunk/debian/patches/series	2015-07-22 21:02:21 UTC (rev 19688)
@@ -4,3 +4,4 @@
 40_upstream_r12815__lintian_spelling
 50_private_nameservers
 60_use_packaged_phyml
+70_skip_compler_version_check.patch