[Debichem-commits] r1073 - in /unstable/gromacs/debian: changelog gromacs-dev.dirs gromacs-doc.dirs gromacs-doc.doc-base patches/04_autoconf_mpisuffix.dpatch rules

nbreen-guest at users.alioth.debian.org nbreen-guest at users.alioth.debian.org
Thu Feb 14 02:27:43 UTC 2008 

Author: nbreen-guest
Date: Thu Feb 14 02:27:36 2008
New Revision: 1073

URL: http://svn.debian.org/wsvn/debichem/?sc=1&rev=1073
Log:
Final changes for 3.3.3~pre1-1

Modified:
    unstable/gromacs/debian/changelog
    unstable/gromacs/debian/gromacs-dev.dirs
    unstable/gromacs/debian/gromacs-doc.dirs
    unstable/gromacs/debian/gromacs-doc.doc-base
    unstable/gromacs/debian/patches/04_autoconf_mpisuffix.dpatch
    unstable/gromacs/debian/rules

Modified: unstable/gromacs/debian/changelog
URL: http://svn.debian.org/wsvn/debichem/unstable/gromacs/debian/changelog?rev=1073&op=diff
==============================================================================
--- unstable/gromacs/debian/changelog (original)
+++ unstable/gromacs/debian/changelog Thu Feb 14 02:27:36 2008
@@ -1,4 +1,4 @@
-gromacs (3.3.3~pre1-1) UNRELEASED; urgency=low
+gromacs (3.3.3~pre1-1) unstable; urgency=low
 
   [ Nicholas Breen ]
   * New upstream release.
@@ -25,8 +25,8 @@
       g77 -> gfortran transition.
     - add Build-Depends on autoconf and automake, and Build-Conflicts
       on autoconf2.13, to support updated mpisuffix patch.
-  * debian/patches/04_autoconf_mpisuffix.dpatch: rewrite to use AC_ARG_VAR
-    instead of AC_ARG_ENABLE (suggested by dleidert); reduce patch to only
+  * debian/patches/04_autoconf_mpisuffix.dpatch: apply dleidert's improved
+    patch to allow arbitrary overrides of LIBSUFFIX; reduce patch to only
     the directly changed code in configure.ac, and add an invocation of
     autotools during the build process rather than patching configure
     itself directly.
@@ -54,7 +54,7 @@
     - fixed .PHONY target for above
   * debian/watch: Added pre-release version handling.
 
- -- Nicholas Breen <nbreen at ofb.net>  Tue, 12 Feb 2008 14:39:29 -0800
+ -- Nicholas Breen <nbreen at ofb.net>  Wed, 13 Feb 2008 15:01:50 -0800
 
 gromacs (3.3.2-3) unstable; urgency=low
 

Modified: unstable/gromacs/debian/gromacs-dev.dirs
URL: http://svn.debian.org/wsvn/debichem/unstable/gromacs/debian/gromacs-dev.dirs?rev=1073&op=diff
==============================================================================
--- unstable/gromacs/debian/gromacs-dev.dirs (original)
+++ unstable/gromacs/debian/gromacs-dev.dirs Thu Feb 14 02:27:36 2008
@@ -1,3 +1,3 @@
 usr/lib
 usr/share/gromacs
-usr/share/doc
+usr/share/doc/gromacs-dev

Modified: unstable/gromacs/debian/gromacs-doc.dirs
URL: http://svn.debian.org/wsvn/debichem/unstable/gromacs/debian/gromacs-doc.dirs?rev=1073&op=diff
==============================================================================
--- unstable/gromacs/debian/gromacs-doc.dirs (original)
+++ unstable/gromacs/debian/gromacs-doc.dirs Thu Feb 14 02:27:36 2008
@@ -1,4 +1,6 @@
 usr/share/doc/gromacs
+usr/share/doc/gromacs-doc
+usr/share/doc/gromacs-dev
 usr/share/gromacs
 usr/share/gromacs/shell-specific
 usr/share/lintian/overrides

Modified: unstable/gromacs/debian/gromacs-doc.doc-base
URL: http://svn.debian.org/wsvn/debichem/unstable/gromacs/debian/gromacs-doc.doc-base?rev=1073&op=diff
==============================================================================
--- unstable/gromacs/debian/gromacs-doc.doc-base (original)
+++ unstable/gromacs/debian/gromacs-doc.doc-base Thu Feb 14 02:27:36 2008
@@ -7,8 +7,8 @@
 Section: Applications/Science/Chemistry
 
 Format: pdf
-Files: /usr/share/doc/gromacs-doc/manual.pdf
+Files: /usr/share/doc/gromacs/manual.pdf
 
 Format: HTML
-Index: /usr/share/doc/gromacs-doc/html/online.html
-Files: /usr/share/doc/gromacs-doc/html/*.html
+Index: /usr/share/doc/gromacs/html/online.html
+Files: /usr/share/doc/gromacs/html/*.html

Modified: unstable/gromacs/debian/patches/04_autoconf_mpisuffix.dpatch
URL: http://svn.debian.org/wsvn/debichem/unstable/gromacs/debian/patches/04_autoconf_mpisuffix.dpatch?rev=1073&op=diff
==============================================================================
--- unstable/gromacs/debian/patches/04_autoconf_mpisuffix.dpatch (original)
+++ unstable/gromacs/debian/patches/04_autoconf_mpisuffix.dpatch Thu Feb 14 02:27:36 2008
@@ -2,7 +2,7 @@
 ## 04_autoconf_mpisuffix.dpatch by Nicholas Breen <nbreen at ofb.net>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds new --enable-mpi-libsuffix=NAME option to configure script,
+## DP: Adds more flexible support for LIBSUFFIX in configure script,
 ## DP: allowing for parallel installation of libraries built with different
 ## DP: MPI implementations.
 ## DP: After applying this patch, the autotools must be re-run.
@@ -10,27 +10,35 @@
 
 @DPATCH@
 
---- gromacs-3.3.3_pre1-orig/configure.ac        2007-11-21 22:49:40.000000000 -0800
-+++ gromacs-3.3.3_pre1/configure.ac     2008-02-11 15:31:55.000000000 -0800
-@@ -60,6 +60,11 @@
- AC_ARG_ENABLE(mpi,
-  [  --enable-mpi                  compile for parallel runs using MPI],,enable_mpi=no)
+--- gromacs-3.3.3_pre1_orig/configure.ac   2008-02-13 02:48:32.000000000 +0100
++++ gromacs-3.3.3_pre1/configure.ac        2008-02-13 02:51:04.000000000 +0100
+@@ -849,13 +849,22 @@ AC_SUBST(GMXANA_LIBOBJS)
+ # However, the non-suffixed names are linked to the _mpi and/or _d suffixed
+ # ones upon installation if that is the only version available.
+ 
+-if test "$enable_mpi" = "yes"; then
+-  LIBSUFFIX="_mpi"
+-fi
+-if test "$enable_float" = "no"; then
+-  LIBSUFFIX="${LIBSUFFIX}_d"
++AC_ARG_VAR(
++  [LIBSUFFIX],
++  [To tell libraries apart, a suffix can be used. This is normally done
++   automatically during ./configure (_d|_mpi|_mpi_d). But with this
++   variable you can overwrite it
++  ]
++)
++if test -z ${LIBSUFFIX} ; then
++  if test "$enable_mpi" = "yes"; then
++    LIBSUFFIX="_mpi"
++  fi
++  if test "$enable_float" = "no"; then
++    LIBSUFFIX="${LIBSUFFIX}_d"
++  fi
+ fi
+-AC_SUBST(LIBSUFFIX) 
++AC_SUBST(LIBSUFFIX)
+ 
+ # Unless the user has explicitly requested a prefix/suffix/transform, we
+ # use _d on double precision files. Don't add anything for mpi, but at the
 
-+### Append an additional suffix to MPI library names, so that builds against different
-+### MPI implementations may be installed in parallel
-+AC_ARG_VAR([LIBSUFFIX_ADD],
-+ [append LIBSUFFIX_ADD to the MPI library names])
-+
- ### Threads
- AC_ARG_ENABLE(threads,
-  [  --disable-threads             don't try to use multithreading],,enable_threads=no)
-@@ -852,6 +857,9 @@
- if test "$enable_mpi" = "yes"; then
-   LIBSUFFIX="_mpi"
- fi
-+if test -n "${LIBSUFFIX_ADD}"; then
-+  LIBSUFFIX="${LIBSUFFIX}_${LIBSUFFIX_ADD}"
-+fi
- if test "$enable_float" = "no"; then
-   LIBSUFFIX="${LIBSUFFIX}_d"
- fi

Modified: unstable/gromacs/debian/rules
URL: http://svn.debian.org/wsvn/debichem/unstable/gromacs/debian/rules?rev=1073&op=diff
==============================================================================
--- unstable/gromacs/debian/rules (original)
+++ unstable/gromacs/debian/rules Thu Feb 14 02:27:36 2008
@@ -49,7 +49,6 @@
 	--enable-mpi \
 	--disable-nice \
 	--without-x \
-	LIBSUFFIX_ADD=lam \
 	MPICC=/usr/bin/mpicc.lam \
 	CC=/usr/bin/mpicc.lam
 
@@ -57,7 +56,6 @@
 	--enable-mpi \
 	--disable-nice \
 	--without-x \
-	LIBSUFFIX_ADD=mpich \
 	MPICC=/usr/bin/mpicc.mpich \
 	CC=/usr/bin/mpicc.mpich
 
@@ -66,7 +64,6 @@
 	--disable-nice \
 	--disable-fortran \
 	--without-x \
-	LIBSUFFIX_ADD=openmpi \
 	MPICC=/usr/bin/mpicc.openmpi \
 	CC=/usr/bin/mpicc.openmpi
 
@@ -85,24 +82,24 @@
 configure: patch-stamp configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
+	-test -r /usr/share/misc/config.sub && \
+	   cp -f /usr/share/misc/config.sub config.sub
+	-test -r /usr/share/misc/config.guess && \
+	   cp -f /usr/share/misc/config.guess config.guess
 	# patch 04_autoconf_mpisuffix changes configure.ac, requiring a fresh autotools pass
 	aclocal && \
 	autoconf && \
-	automake1.10
-	-test -r /usr/share/misc/config.sub && \
-	    cp -f /usr/share/misc/config.sub config.sub
-	-test -r /usr/share/misc/config.guess && \
-	    cp -f /usr/share/misc/config.guess config.guess
+	automake-1.10
 	# -dp is the place for double-precision builds
 	(mkdir -p build/basic; cd build/basic; ../../configure $(COMMON_CONFIG_PARAMS))
 	(mkdir -p build/basic-dp; cd build/basic-dp; ../../configure $(COMMON_CONFIG_PARAMS) --program-suffix=_d --enable-double)
-	(mkdir -p build/lam; cd build/lam; ../../configure $(COMMON_CONFIG_PARAMS) $(LAM_CONFIG_PARAMS) --program-suffix=_mpi.lam)
-	(mkdir -p build/lam-dp; cd build/lam-dp; ../../configure $(COMMON_CONFIG_PARAMS) $(LAM_CONFIG_PARAMS) --program-suffix=_mpi_d.lam --enable-double)
-	(mkdir -p build/mpich; cd build/mpich; ../../configure $(COMMON_CONFIG_PARAMS) $(MPICH_CONFIG_PARAMS) --program-suffix=_mpi.mpich)
-	(mkdir -p build/mpich-dp; cd build/mpich-dp; ../../configure $(COMMON_CONFIG_PARAMS) $(MPICH_CONFIG_PARAMS) --program-suffix=_mpi_d.mpich --enable-double)
-ifneq (,$(findstring $(DEB_HOST_ARCH),$(OPENMPI_ARCH)))
-	(mkdir -p build/openmpi; cd build/openmpi; ../../configure $(COMMON_CONFIG_PARAMS) $(OPENMPI_CONFIG_PARAMS) --program-suffix=_mpi.openmpi)
-	(mkdir -p build/openmpi-dp; cd build/openmpi-dp; ../../configure $(COMMON_CONFIG_PARAMS) $(OPENMPI_CONFIG_PARAMS) --program-suffix=_mpi_d.openmpi --enable-double)
+	(mkdir -p build/lam; cd build/lam; ../../configure $(COMMON_CONFIG_PARAMS) $(LAM_CONFIG_PARAMS) LIBSUFFIX=_mpi_lam --program-suffix=_mpi.lam)
+	(mkdir -p build/lam-dp; cd build/lam-dp; ../../configure $(COMMON_CONFIG_PARAMS) $(LAM_CONFIG_PARAMS) LIBSUFFIX=_mpi_d_lam --program-suffix=_mpi_d.lam --enable-double)
+	(mkdir -p build/mpich; cd build/mpich; ../../configure $(COMMON_CONFIG_PARAMS) $(MPICH_CONFIG_PARAMS) LIBSUFFIX=_mpi_mpich --program-suffix=_mpi.mpich)
+	(mkdir -p build/mpich-dp; cd build/mpich-dp; ../../configure $(COMMON_CONFIG_PARAMS) $(MPICH_CONFIG_PARAMS) LIBSUFFIX=_mpi_d_mpich --program-suffix=_mpi_d.mpich --enable-double)
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(OPENMPI_ARCH)))
+	(mkdir -p build/openmpi; cd build/openmpi; ../../configure $(COMMON_CONFIG_PARAMS) $(OPENMPI_CONFIG_PARAMS) LIBSUFFIX=_mpi_openmpi --program-suffix=_mpi.openmpi)
+	(mkdir -p build/openmpi-dp; cd build/openmpi-dp; ../../configure $(COMMON_CONFIG_PARAMS) $(OPENMPI_CONFIG_PARAMS) LIBSUFFIX=_mpi_d_openmpi --program-suffix=_mpi_d.openmpi --enable-double)
 endif
 	touch $@
 
@@ -181,8 +178,8 @@
 	   $(CURDIR)/debian/gromacs-doc/usr/share/doc/gromacs/html
 	uudecode -o $(CURDIR)/debian/gromacs-doc/usr/share/doc/gromacs/manual.pdf \
 	          < $(CURDIR)/debian/man/manual.pdf.uue
-	dh_link -pgromacs-doc usr/share/doc/gromacs-doc/html usr/share/gromacs/html
-	dh_link -pgromacs-doc usr/share/doc/gromacs-doc/html usr/share/doc/gromacs-dev/html
+	dh_link -pgromacs-doc usr/share/doc/gromacs/html usr/share/doc/gromacs-doc/html
+	dh_link -pgromacs-doc usr/share/doc/gromacs/html usr/share/doc/gromacs-dev/html
 	# one lintian warning is overridden:
 	# - csh-considered-harmful: from a pair of tutorial scripts, not essential for routine package operation
 	cp $(CURDIR)/debian/lintian-overrides.gromacs-doc \
@@ -273,7 +270,8 @@
 	# install doc-base file from gromacs-doc and generate postinst/postrm,
 	# but don't install a duplicate copyright file.  all other files are
 	# moved into place in the build-basic target.
-	dh_installdocs -pgromacs-doc -Xcopyright -XTODO
+	dh_installchangelogs -i
+	dh_installdocs -pgromacs-doc -XTODO
 	dh_compress -i -X.pdf
 	dh_fixperms -i
 	dh_installdeb -i
@@ -285,7 +283,7 @@
 	dh_testdir -s
 	dh_testroot -s
 	dh_installchangelogs -s
-	dh_installdocs -s
+	dh_installdocs -s -XTODO
 	dh_strip -A
 	dh_link -s
 	dh_compress -s -X.pdf

More information about the Debichem-commits mailing list