[SCM] Viewmol: a graphical front end for computational chemistry programs. branch, debian-unstable, updated. viewmol-2.4.1-16-20-g06e2f48

[Drew Parsons]

The following commit has been merged in the debian-unstable branch:
commit 5207cd8dd7e497e3e56a562aa856ff6940363bb1
Author: Drew Parsons <dparsons at debian.org>
Date:   Sun Sep 26 10:36:30 2010 +1000

    Pre-apply the HURD patch 011_getmachine_HURD.diff
    
    Pre-apply the HURD patch 011_getmachine_HURD.diff from bug#534330 in
    order to allow the HURD to be recognised during debian/rules clean.
    This rule is run before patch by dpkg-buildpackage.
    (Probably not safe to set the dependency clean: patch).

diff --git a/debian/changelog b/debian/changelog
index c42a5fd..d3e257d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+viewmol (2.4.1-17) UNRELEASED; urgency=low
+
+  * Pre-apply the HURD patch 011_getmachine_HURD.diff from bug#534330
+    in order to allow the HURD to be recognised during debian/rules
+    clean. This rule is run before patch by dpkg-buildpackage.
+    (Probably not safe to set the dependency clean: patch).
+
+ -- Drew Parsons <dparsons at debian.org>  Sun, 26 Sep 2010 10:33:07 +1000
+
 viewmol (2.4.1-16) unstable; urgency=low
 
   * Patch 011_getmachine_HURD.diff lets the getmachine build script
diff --git a/debian/patches/series b/debian/patches/series
index f79cd89..012eaee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 010_build_scripts.diff
-011_getmachine_HURD.diff
+#011_getmachine_HURD.diff  # already applied pre-quilt (to allow debian/rules clean to recognise HURD)
 100_locale_exception.diff
 110_desktop_app.diff
 120_PyObject.diff
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..a92bdd2
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,5 @@
+# HURD patch 011_getmachine_HURD.diff from bug#534330 had to be pre-applied 
+# in order to allow the HURD to be recognised during debian/rules clean. 
+# This rule is run before patch by dpkg-buildpackage.
+viewmol source: patch-system-but-direct-changes-in-diff source/getmachine
+
diff --git a/source/getmachine b/source/getmachine
index f82b259..5c9671f 100755
--- a/source/getmachine
+++ b/source/getmachine
@@ -388,6 +388,32 @@ case $os in
             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.
 #

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