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

[Andreas Tille]

Author: tille
Date: 2009-09-07 11:26:29 +0000 (Mon, 07 Sep 2009)
New Revision: 3909

Modified:
   trunk/packages/arb/trunk/debian/changelog
   trunk/packages/arb/trunk/debian/control
   trunk/packages/arb/trunk/debian/patches/20_config.makefiles
   trunk/packages/arb/trunk/debian/patches/30_phyml
   trunk/packages/arb/trunk/debian/patches/series
   trunk/packages/arb/trunk/debian/rules
Log:
Enable compilation on 32 and 64 bit machines


Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog	2009-09-07 10:11:04 UTC (rev 3908)
+++ trunk/packages/arb/trunk/debian/changelog	2009-09-07 11:26:29 UTC (rev 3909)
@@ -7,6 +7,8 @@
     seems to be missing.
     Closes: #522021
   * Standards-Version: 3.8.3 (Added README.source)
+  * Build-Depends: dpkg-dev (>= 1.15.4) to make use of
+    `dpkg-architecture -qDEB_BUILD_ARCH_BITS` in Makefile
 
   [ David Paleino ]
   * Removed myself from Uploaders

Modified: trunk/packages/arb/trunk/debian/control
===================================================================
--- trunk/packages/arb/trunk/debian/control	2009-09-07 10:11:04 UTC (rev 3908)
+++ trunk/packages/arb/trunk/debian/control	2009-09-07 11:26:29 UTC (rev 3909)
@@ -4,7 +4,7 @@
 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: debhelper (>= 7), quilt, libmotif-dev, xviewg-dev,
+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

Modified: trunk/packages/arb/trunk/debian/patches/20_config.makefiles
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_config.makefiles	2009-09-07 10:11:04 UTC (rev 3908)
+++ trunk/packages/arb/trunk/debian/patches/20_config.makefiles	2009-09-07 11:26:29 UTC (rev 3909)
@@ -1,6 +1,6 @@
 --- /dev/null
-+++ arb-0.0.20071207.1/config.makefile
-@@ -0,0 +1,26 @@
++++ arbsrc_6182/config.makefile
+@@ -0,0 +1,27 @@
 +# --------------------------------------------------------------------------------
 +# If this file is named config.makefile.template then copy it to config.makefile
 +# DO NOT EDIT config.makefile.template
@@ -13,7 +13,8 @@
 +DEBUG_GRAPHICS = 0# force instant graphic update
 +# SEER = 1
 +OPENGL=1
-+ARB_64=0# compile on 64 bit machine (has no effect yet)
++# 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 1; else 0 fi)
 +
 +# --------------------------------------------------------------------------------
 +# target machine section

Modified: trunk/packages/arb/trunk/debian/patches/30_phyml
===================================================================
--- trunk/packages/arb/trunk/debian/patches/30_phyml	2009-09-07 10:11:04 UTC (rev 3908)
+++ trunk/packages/arb/trunk/debian/patches/30_phyml	2009-09-07 11:26:29 UTC (rev 3909)
@@ -1,5 +1,5 @@
---- arb-0.0.20071207.1.orig/GDE/PHYML/Makefile
-+++ arb-0.0.20071207.1/GDE/PHYML/Makefile
+--- arbsrc_6182.orig/GDE/PHYML/Makefile
++++ arbsrc_6182/GDE/PHYML/Makefile
 @@ -13,7 +13,8 @@
  # original compilation
  
@@ -10,13 +10,3 @@
  # CFLAGS = -Wall
  # CFLAGS = -g -Wall
  # CFLAGS = -pg -Wall -fprofile-arcs -static
-@@ -25,7 +26,8 @@
- # compilation together with ARB
- 
- CC     = $(ACC)
--CFLAGS = $(cflags) -fomit-frame-pointer -static  
-+CFLAGS = $(cflags) -fomit-frame-pointer
-+# -static  
- EXEC   = $(ARBHOME)/bin/phyml
- 
- # ARBs standard target

Modified: trunk/packages/arb/trunk/debian/patches/series
===================================================================
--- trunk/packages/arb/trunk/debian/patches/series	2009-09-07 10:11:04 UTC (rev 3908)
+++ trunk/packages/arb/trunk/debian/patches/series	2009-09-07 11:26:29 UTC (rev 3909)
@@ -1,4 +1,3 @@
-20_perlscripts
 30_phyml
 20_config.makefiles
 30_Makefile_main

Modified: trunk/packages/arb/trunk/debian/rules
===================================================================
--- trunk/packages/arb/trunk/debian/rules	2009-09-07 10:11:04 UTC (rev 3908)
+++ trunk/packages/arb/trunk/debian/rules	2009-09-07 11:26:29 UTC (rev 3909)
@@ -163,17 +163,9 @@
 	dh_md5sums -a
 	dh_builddeb -a
 
-RemoveFilesFromSource=GDEHELP/HELP_DOC_GEN/* GDEHELP/HELP_GEN/* GDEHELP/ARB_GDEmenus GDEHELP/helpfiles.lst \
-                      HELP_SOURCE/_index.html NTREE/nt_date.h \
-		      lib/ARB.pm \
-		      $(RemoveFromSourceAndBuild)
-
 # To update po files as recommended in po-debconf(7) 
 debian/po/templates.pot: debian/arb-common.templates
 	@debconf-updatepo
 
-get-orig-source:
-	sh debian/get-orig-source
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install