Commit 39f852d8 authored by Nicholas Breen's avatar Nicholas Breen

* patches/32_cmake_tools: Build g_hydorder and g_densorder.

* rules: Switch to using dh_lintian.
parent 5f4c8a92
......@@ -6,7 +6,9 @@ gromacs (4.5.4-2) unstable; urgency=low
* patches/30_git_release-4.5-patches.dpatch: Routine update from upstream
git, to commit 873563ef of 22 April 2011.
* patches/31_manpages.dpatch: Various minor spelling and header fixes.
* patches/32_cmake_tools: Build g_hydorder and g_densorder.
* lintian-overrides.gromacs: Remove checks no longer needed, per #120323.
* rules: Switch to using dh_lintian.
-- Nicholas Breen <nbreen@ofb.net> Mon, 25 Apr 2011 11:56:25 -0700
......
......@@ -3,4 +3,3 @@ usr/share/doc/gromacs-data
usr/share/doc/gromacs-dev
usr/share/gromacs
usr/share/gromacs/shell-specific
usr/share/lintian/overrides
usr/bin
usr/share/man/man1
usr/share/lintian/overrides
usr/bin
usr/share/gromacs
usr/share/doc/gromacs
usr/share/lintian/overrides
11_readme.dpatch
30_git_release-4.5-patches.dpatch
31_manpages.dpatch
32_cmake_tools.dpatch
#! /bin/sh /usr/share/dpatch/dpatch-run
## 32_cmake_tools.dpatch by Nicholas Breen <nbreen@ofb.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Edit CMakeFiles to build g_hydorder and g_densorder.
@DPATCH@
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index fae78d5..1fb83f5 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -29,6 +29,7 @@ add_library(gmxana
gmx_genpr.c gmx_eneconv.c gmx_vanhove.c gmx_wheel.c
addconf.c calcpot.c edittop.c gmx_bar.c
gmx_pme_error.c gmx_options.c
+ gmx_densorder.c gmx_hydorder.c
)
@@ -51,7 +52,7 @@ set(GMX_TOOLS_PROGRAMS
g_rmsf g_rotacf g_saltbr g_sas g_sgangle g_sham g_sorient
g_spol g_spatial g_tcaf g_traj g_tune_pme g_vanhove
g_velacc g_clustsize g_mdmat g_wham g_sigeps g_bar
- g_pme_error g_rmsdist g_rotmat g_options
+ g_pme_error g_rmsdist g_rotmat g_options g_densorder g_hydorder
)
set(GMX_TOOLS_PROGRAMS_NOT_FOR_INSTALLATION
......@@ -147,8 +147,7 @@ install: build install-basic install-mpich install-openmpi
dh_link -pgromacs-data usr/share/doc/gromacs/html usr/share/doc/gromacs-dev/html
# one lintian warning is overridden:
# - script-not-executable: demo scripts outside of $PATH
cp $(CURDIR)/debian/lintian-overrides.gromacs-data \
$(CURDIR)/debian/gromacs-data/usr/share/lintian/overrides/gromacs-data
dh_lintian -pgromacs-data
# rename a pair of Perl scripts to drop the .pl extension (Policy 10.4)
mv $(CURDIR)/debian/gromacs/usr/bin/demux.pl $(CURDIR)/debian/gromacs/usr/bin/demux
mv $(CURDIR)/debian/gromacs/usr/bin/xplor2gmx.pl $(CURDIR)/debian/gromacs/usr/bin/xplor2gmx
......@@ -190,7 +189,7 @@ install-basic: build
# - shlib-with-executable-stack: it's a side effect of the ASM inner
# loops (i386/amd64 only)
# - binary-without-manpage: shipped in gromacs-data instead.
cp $(CURDIR)/debian/lintian-overrides.gromacs $(CURDIR)/debian/gromacs/usr/share/lintian/overrides/gromacs
dh_lintian -pgromacs
install-mpich: build
dh_testdir
......@@ -201,7 +200,7 @@ install-mpich: build
$(MAKE) -C build/mpich-dp install-mdrun DESTDIR=$(CURDIR)/debian/gromacs-mpich
dh_installman -pgromacs-mpich debian/man/mdrun_mpi.mpich.1
dh_link -pgromacs-mpich usr/share/man/man1/mdrun_mpi.mpich.1.gz usr/share/man/man1/mdrun_mpi_d.mpich.1.gz
cp $(CURDIR)/debian/lintian-overrides.gromacs-mpich $(CURDIR)/debian/gromacs-mpich/usr/share/lintian/overrides/gromacs-mpich
dh_lintian -pgromacs-mpich
install-openmpi: build
dh_testdir
......@@ -213,7 +212,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),$(OPENMPI_ARCH)))
$(MAKE) -C build/openmpi-dp install-mdrun DESTDIR=$(CURDIR)/debian/gromacs-openmpi
dh_installman -pgromacs-openmpi debian/man/mdrun_mpi.openmpi.1
dh_link -pgromacs-openmpi usr/share/man/man1/mdrun_mpi.openmpi.1.gz usr/share/man/man1/mdrun_mpi_d.openmpi.1.gz
cp $(CURDIR)/debian/lintian-overrides.gromacs-openmpi $(CURDIR)/debian/gromacs-openmpi/usr/share/lintian/overrides/gromacs-openmpi
dh_lintian -pgromacs-openmpi
endif
binary-indep: build install
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment