[syrthes/master] Rename patch syrthes_arch to syrthes_env.
Gilles Filippini
gilles.filippini at free.fr
Fri Jul 10 22:50:09 UTC 2009
---
debian/patches/series | 2 +-
debian/patches/syrthes_arch | 102 -------------------------------------------
debian/patches/syrthes_env | 102 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 103 insertions(+), 103 deletions(-)
delete mode 100644 debian/patches/syrthes_arch
create mode 100644 debian/patches/syrthes_env
diff --git a/debian/patches/series b/debian/patches/series
index c9dce36..3042700 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-syrthes_arch
+syrthes_env
diff --git a/debian/patches/syrthes_arch b/debian/patches/syrthes_arch
deleted file mode 100644
index 9f43c51..0000000
--- a/debian/patches/syrthes_arch
+++ /dev/null
@@ -1,102 +0,0 @@
-Set the SYRTHES environment variables for a debian box.
-Index: syrthes/bin/syrthes.profile
-===================================================================
---- syrthes.orig/bin/syrthes.profile 2009-06-06 14:58:10.000000000 +0200
-+++ syrthes/bin/syrthes.profile 2009-06-06 15:01:21.000000000 +0200
-@@ -32,43 +32,42 @@
-
- # Architecture name and location of the directory for installation
- # ================================================================
-- NOM_ARCH=`uname -s`
-- PATHSYR=/home/syrthes
-+ NOM_ARCH=Linux
-
- #------------------------------------------------------------------------
- # Only in case of installation on multiple architectures
-
- # Architecture
-- NOM_ARCH=`uname -s`
-- if [ "$NOM_ARCH" = "Linux" ] ; then
-- if [ "`hostname | cut -c1-7`" = "platine" ] ; then
-- NOM_ARCH=Linux_IA64
-- elif [ "`domainname 2>/dev/null`" = "cluster-chatou" ] ; then
-- NOM_ARCH=Linux_Ch
-- elif [ -d /bgl/BlueLight/ppcfloor ] ; then
-- NOM_ARCH=Blue_Gene_L
-- elif [ -d /bgsys/drivers/ppcfloor ] ; then
-- NOM_ARCH=Blue_Gene_P
-- else
-- MACHINE=`uname -m`
-- case "$MACHINE" in
-- *86) NOM_ARCH=Linux ;;
-- x86_64) NOM_ARCH=Linux_x86_64 ;;
-- ia64) NOM_ARCH=Linux_IA64 ;;
-- *) NOM_ARCH=Linux_$MACHINE ;;
-- esac
-- fi
-- fi
-+# NOM_ARCH=`uname -s`
-+# if [ "$NOM_ARCH" = "Linux" ] ; then
-+# if [ "`hostname | cut -c1-7`" = "platine" ] ; then
-+# NOM_ARCH=Linux_IA64
-+# elif [ "`domainname 2>/dev/null`" = "cluster-chatou" ] ; then
-+# NOM_ARCH=Linux_Ch
-+# elif [ -d /bgl/BlueLight/ppcfloor ] ; then
-+# NOM_ARCH=Blue_Gene_L
-+# elif [ -d /bgsys/drivers/ppcfloor ] ; then
-+# NOM_ARCH=Blue_Gene_P
-+# else
-+# MACHINE=`uname -m`
-+# case "$MACHINE" in
-+# *86) NOM_ARCH=Linux ;;
-+# x86_64) NOM_ARCH=Linux_x86_64 ;;
-+# ia64) NOM_ARCH=Linux_IA64 ;;
-+# *) NOM_ARCH=Linux_$MACHINE ;;
-+# esac
-+# fi
-+# fi
-
- #-----------------------------------------------------------
- #
-- SYRTHES_HOME=${PATHSYR}/syrthes3.4.2
-+ SYRTHES_HOME=/usr/lib/syrthes
- #
- # Path
- PATH=${SYRTHES_HOME}/bin:${SYRTHES_HOME}/bin/${NOM_ARCH}:$PATH
- export PATH
-
- # Export des variables
-- export NOM_ARCH NOM_USER SYRTHES_HOME
-+ export NOM_ARCH SYRTHES_HOME
-
-
-Index: syrthes/bin/Makefile.in
-===================================================================
---- syrthes.orig/bin/Makefile.in 2009-06-06 14:58:09.000000000 +0200
-+++ syrthes/bin/Makefile.in 2009-06-06 15:00:54.000000000 +0200
-@@ -43,10 +43,10 @@
- CC = /usr/bin/gcc
- CFLAGS = -O2 -D_FILE_OFFSET_BITS=64 -DHAVE_C_IO
- # FORTRAN compiler
-- FC = /usr/bin/g77
-+ FC = /usr/bin/gfortran
- FCFLAGS = -O2 -DHAVE_C_IO -D_FILE_OFFSET_BITS=64
- # loader
-- LD = /usr/bin/g77
-+ LD = /usr/bin/gfortran
- LDFLAGS = -O2
- #
- endif
-Index: syrthes/bin/Makefile
-===================================================================
---- syrthes.orig/bin/Makefile 2009-06-06 14:58:09.000000000 +0200
-+++ syrthes/bin/Makefile 2009-06-06 15:00:54.000000000 +0200
-@@ -133,7 +133,7 @@
- @rm -f *.o
-
- @if [ ! -d "$(ARCH_SYRTHES)" ] ;\
-- then mkdir "$(ARCH_SYRTHES)" ;\
-+ then mkdir -p "$(ARCH_SYRTHES)" ;\
- fi ;\
-
- @mv *.a $(ARCH_SYRTHES)
diff --git a/debian/patches/syrthes_env b/debian/patches/syrthes_env
new file mode 100644
index 0000000..9f43c51
--- /dev/null
+++ b/debian/patches/syrthes_env
@@ -0,0 +1,102 @@
+Set the SYRTHES environment variables for a debian box.
+Index: syrthes/bin/syrthes.profile
+===================================================================
+--- syrthes.orig/bin/syrthes.profile 2009-06-06 14:58:10.000000000 +0200
++++ syrthes/bin/syrthes.profile 2009-06-06 15:01:21.000000000 +0200
+@@ -32,43 +32,42 @@
+
+ # Architecture name and location of the directory for installation
+ # ================================================================
+- NOM_ARCH=`uname -s`
+- PATHSYR=/home/syrthes
++ NOM_ARCH=Linux
+
+ #------------------------------------------------------------------------
+ # Only in case of installation on multiple architectures
+
+ # Architecture
+- NOM_ARCH=`uname -s`
+- if [ "$NOM_ARCH" = "Linux" ] ; then
+- if [ "`hostname | cut -c1-7`" = "platine" ] ; then
+- NOM_ARCH=Linux_IA64
+- elif [ "`domainname 2>/dev/null`" = "cluster-chatou" ] ; then
+- NOM_ARCH=Linux_Ch
+- elif [ -d /bgl/BlueLight/ppcfloor ] ; then
+- NOM_ARCH=Blue_Gene_L
+- elif [ -d /bgsys/drivers/ppcfloor ] ; then
+- NOM_ARCH=Blue_Gene_P
+- else
+- MACHINE=`uname -m`
+- case "$MACHINE" in
+- *86) NOM_ARCH=Linux ;;
+- x86_64) NOM_ARCH=Linux_x86_64 ;;
+- ia64) NOM_ARCH=Linux_IA64 ;;
+- *) NOM_ARCH=Linux_$MACHINE ;;
+- esac
+- fi
+- fi
++# NOM_ARCH=`uname -s`
++# if [ "$NOM_ARCH" = "Linux" ] ; then
++# if [ "`hostname | cut -c1-7`" = "platine" ] ; then
++# NOM_ARCH=Linux_IA64
++# elif [ "`domainname 2>/dev/null`" = "cluster-chatou" ] ; then
++# NOM_ARCH=Linux_Ch
++# elif [ -d /bgl/BlueLight/ppcfloor ] ; then
++# NOM_ARCH=Blue_Gene_L
++# elif [ -d /bgsys/drivers/ppcfloor ] ; then
++# NOM_ARCH=Blue_Gene_P
++# else
++# MACHINE=`uname -m`
++# case "$MACHINE" in
++# *86) NOM_ARCH=Linux ;;
++# x86_64) NOM_ARCH=Linux_x86_64 ;;
++# ia64) NOM_ARCH=Linux_IA64 ;;
++# *) NOM_ARCH=Linux_$MACHINE ;;
++# esac
++# fi
++# fi
+
+ #-----------------------------------------------------------
+ #
+- SYRTHES_HOME=${PATHSYR}/syrthes3.4.2
++ SYRTHES_HOME=/usr/lib/syrthes
+ #
+ # Path
+ PATH=${SYRTHES_HOME}/bin:${SYRTHES_HOME}/bin/${NOM_ARCH}:$PATH
+ export PATH
+
+ # Export des variables
+- export NOM_ARCH NOM_USER SYRTHES_HOME
++ export NOM_ARCH SYRTHES_HOME
+
+
+Index: syrthes/bin/Makefile.in
+===================================================================
+--- syrthes.orig/bin/Makefile.in 2009-06-06 14:58:09.000000000 +0200
++++ syrthes/bin/Makefile.in 2009-06-06 15:00:54.000000000 +0200
+@@ -43,10 +43,10 @@
+ CC = /usr/bin/gcc
+ CFLAGS = -O2 -D_FILE_OFFSET_BITS=64 -DHAVE_C_IO
+ # FORTRAN compiler
+- FC = /usr/bin/g77
++ FC = /usr/bin/gfortran
+ FCFLAGS = -O2 -DHAVE_C_IO -D_FILE_OFFSET_BITS=64
+ # loader
+- LD = /usr/bin/g77
++ LD = /usr/bin/gfortran
+ LDFLAGS = -O2
+ #
+ endif
+Index: syrthes/bin/Makefile
+===================================================================
+--- syrthes.orig/bin/Makefile 2009-06-06 14:58:09.000000000 +0200
++++ syrthes/bin/Makefile 2009-06-06 15:00:54.000000000 +0200
+@@ -133,7 +133,7 @@
+ @rm -f *.o
+
+ @if [ ! -d "$(ARCH_SYRTHES)" ] ;\
+- then mkdir "$(ARCH_SYRTHES)" ;\
++ then mkdir -p "$(ARCH_SYRTHES)" ;\
+ fi ;\
+
+ @mv *.a $(ARCH_SYRTHES)
--
1.5.6.5
More information about the debian-science-commits
mailing list