[SCM] Viewmol: a graphical front end for computational chemistry programs. branch, debian-unstable, updated. viewmol-2.4.1-15-3-g5ce3e19

Drew Parsons dparsons at debian.org
Sun Aug 29 12:39:28 UTC 2010


The following commit has been merged in the debian-unstable branch:
commit 5e95cd0207f674ca42a702e212310cd522154b89
Author: Drew Parsons <dparsons at debian.org>
Date:   Sun Aug 29 21:00:24 2010 +1000

    patch 011_getmachine_HURD.diff: build on Hurd
    
    Patch 011_getmachine_HURD.diff lets the getmachine build script
    recognise the Hurd.  Thanks Barry deFreese. Closes: #534330.

diff --git a/debian/changelog b/debian/changelog
index 88ead57..9ceeb07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+viewmol (2.4.1-16) UNRELEASED; urgency=low
+
+  * Patch 011_getmachine_HURD.diff lets the getmachine build script
+    recognise the Hurd.  Thanks Barry deFreese. Closes: #534330.
+
+ -- Drew Parsons <dparsons at debian.org>  Sun, 29 Aug 2010 21:01:28 +1000
+
 viewmol (2.4.1-15) unstable; urgency=low
 
   * Transfer to group maintainership with Debian Science.
diff --git a/debian/patches/011_getmachine_HURD.diff b/debian/patches/011_getmachine_HURD.diff
new file mode 100644
index 0000000..626a780
--- /dev/null
+++ b/debian/patches/011_getmachine_HURD.diff
@@ -0,0 +1,35 @@
+--- viewmol-2.4.1.orig/source/getmachine
++++ viewmol-2.4.1/source/getmachine
+@@ -388,6 +435,32 @@
+             echo 'LIBRARY=$(LIBTIFF) $(LIBPNG) -L$(LIBPYTHON)' >> makefile
+             echo 'LIBS=-L/usr/local/BerkeleyDB.4.0/lib -L/usr/local/lib -l${PYTHONVERSION} -ltiff -lpng12 -lz -lGLU -lGL -L/usr/X11R6/lib -lXmu -lXm -lXp -lXi -lXext -lXt -lX11 -lpthread -lm -lSM -lICE' >> makefile
+             ;;
++
++#
++# This is GNU.
++#
++  GNU)     dir="$os"
++           makedir
++           cat ../.config.$os > makefile
++           use_icc=`type icc 2> /dev/null`
++           if [ "$use_icc" = "" ]
++           then
++	     findProcessor
++	     echo 'COMPILER=gcc' >> makefile
++             echo "OPT=-O6 -mcpu=$processor -fomit-frame-pointer -ffast-math -malign-double" >> makefile
++             echo 'CFLAGS=-Wall -I/usr/X11R6/include -DLINUX -Wno-strict-aliasing' >> makefile
++             echo "LDFLAGS=$LINKFORSHARED" >> makefile
++           else
++	     echo 'COMPILER=icc' >> makefile
++             echo 'OPT=-O2 -ipo' >> makefile
++             echo 'CFLAGS=-I/opt/intel/compiler50/ia32/include -I/usr/X11R6/include -DLINUX' >> makefile
++             echo "LDFLAGS=$LINKFORSHARED -ipo" >> makefile
++           fi
++           echo 'SCANDIR=' >> makefile
++           echo 'INCLUDE=$(TIFFINCLUDE) -I$(PNGINCLUDE) -I$(PYTHONINCLUDE)' >> makefile
++           echo 'LIBRARY=$(LIBTIFF) $(LIBPNG) -L$(LIBPYTHON)' >> makefile
++           echo 'LIBS=-L/usr/local/lib -l${PYTHONVERSION} -ltiff -lpng -lz -lGLU -lGL -L/usr/X11R6/lib -lXm -lXmu -lXp -lXi -lXext -lXt -lX11 -lpthread -lutil -ldl -lm' >> makefile
++           ;;
+ #
+ # This is a (not yet) known operating system.
+ #
diff --git a/debian/patches/series b/debian/patches/series
index 5f1290c..f79cd89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 010_build_scripts.diff
+011_getmachine_HURD.diff
 100_locale_exception.diff
 110_desktop_app.diff
 120_PyObject.diff

-- 
Viewmol: a graphical front end for computational chemistry programs.



More information about the debian-science-commits mailing list