Commit d23c54dc authored by Nicholas Breen's avatar Nicholas Breen

* New upstream release.

* rules, control: Remove special provisions for FORTRAN on Alpha.
* rules: Update configuration parameters.
* rules, patches/12_copyright-file.patch: Avoid duplication of copyright information into two files, but provide a link to keep both filenames.
parent ffacf14a
......@@ -2,6 +2,9 @@ gromacs (4.6.1-1) UNRELEASED; urgency=low
* New upstream release.
* rules, control: Remove special provisions for FORTRAN on Alpha.
* rules: Update configuration parameters.
* rules, patches/12_copyright-file.patch: Avoid duplication of copyright
information into two files, but provide a link to keep both filenames.
-- Nicholas Breen <nbreen@debian.org> Tue, 19 Mar 2013 11:58:46 -0700
......
......@@ -2,28 +2,27 @@ Description: Edit README to explain that this is not an official upstream build
Origin: vendor
Author: Nicholas Breen <nbreen@debian.org>
Index: gromacs-4.6~beta3/README
Index: gromacs-4.6.1/README
===================================================================
--- gromacs-4.6~beta3.orig/README 2012-12-22 09:49:22.000000000 -0800
+++ gromacs-4.6~beta3/README 2012-12-23 11:01:51.594184879 -0800
--- gromacs-4.6.1.orig/README 2013-05-15 14:22:01.468187072 -0700
+++ gromacs-4.6.1/README 2013-05-15 14:23:05.264336300 -0700
@@ -1,5 +1,5 @@
- Welcome to the official version of GROMACS!
+ Welcome to the Debian version of GROMACS!
If you are familiar with unix, it should be fairly trivial to compile and
install GROMACS. Installation instructions for CMake are available in the
@@ -37,6 +37,13 @@
under GPL, and that it must clearly be labeled as derived work. It should
not use the name "official GROMACS", and make sure support questions are
directed to you instead of the GROMACS developers.
+
If you are familiar with Unix, it should be fairly trivial to compile and
install GROMACS. GROMACS uses only the CMake build sytem, and our
@@ -40,6 +40,12 @@
sure support questions are directed to you instead of the GROMACS developers.
Sorry for the hard wording, but it is meant to protect YOUR reseach results!
++----------------------------------------------------------------------------+
+| Debian users: that means the Bug Tracking System, http://bugs.debian.org/ |
+| (Although this IS technically a derived version, no significant changes |
+| have been made to the upstream code -- it should behave identically.) |
++----------------------------------------------------------------------------+
+
Sorry for the hard wording, but it is meant to protect YOUR reseach results!
* * * * *
The development of GROMACS is mainly funded by academic research grants.
Description: Install only a single copyright file
Avoid duplication of COPYING and debian/copyright. A symlink is provided
between the two.
Author: Nicholas Breen
Origin: vendor
Forwarded: not-needed
Last-Update: 2013-05-15
---
Index: gromacs-4.6.1/CMakeLists.txt
===================================================================
--- gromacs-4.6.1.orig/CMakeLists.txt 2013-05-15 14:23:46.068432259 -0700
+++ gromacs-4.6.1/CMakeLists.txt 2013-05-15 14:23:46.068432259 -0700
@@ -113,7 +113,7 @@
endif()
set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_SOURCE_DIR}/admin/InstallWelcome.txt")
# Its GPL/LGPL, so they do not have to agree to a license for mere usage, but some installers require this...
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/debian/copyright")
set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/admin/InstallInfo.txt")
set(CPACK_SOURCE_IGNORE_FILES "\\\\.isreposource$;\\\\.git/;\\\\.gitignore$")
set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_SOURCE_DIR}/CPackInit.cmake")
@@ -1123,7 +1123,7 @@
#COPYING file: Only necessary for binary distributions.
#Simpler to always install.
-install(FILES COPYING DESTINATION ${DATA_INSTALL_DIR} COMPONENT data)
+install(FILES DESTINATION ${DATA_INSTALL_DIR} COMPONENT data)
add_subdirectory(share)
add_subdirectory(include)
11_readme.patch
12_copyright-file.patch
......@@ -42,18 +42,16 @@ endif
# You must have OpenMM development headers (not packaged) and "nvidia-cuda-dev"
# installed!
ifneq (,$(findstring gpu,$(DEB_BUILD_OPTIONS)))
COMMON_CONFIG_PARAMS += -DGMX_OPENMM=ON -DGMX_THREADS=OFF
COMMON_CONFIG_PARAMS += -DGMX_OPENMM=ON
endif
MPICH_CONFIG_PARAMS = \
-DGMX_MPI=ON \
-DGMX_THREADS=OFF \
-DGMX_X11=OFF \
-DGMX_DEFAULT_SUFFIX=FALSE
OPENMPI_CONFIG_PARAMS = \
-DGMX_MPI=ON \
-DGMX_THREADS=OFF \
-DGMX_DEFAULT_SUFFIX=FALSE \
-DGMX_X11=OFF \
-DCMAKE_EXE_LINKER_FLAGS="-L/usr/lib/openmpi/lib $(LDFLAGS)"
......@@ -142,6 +140,8 @@ install: build install-basic install-mpich install-openmpi
chmod 644 $(CURDIR)/debian/gromacs-data/usr/share/gromacs/shell-specific/*
dh_link -pgromacs-data usr/share/doc/gromacs/html usr/share/doc/gromacs-data/html
dh_link -pgromacs-data usr/share/doc/gromacs/html usr/share/doc/gromacs-dev/html
# this name is also give in documentation
dh_link -pgromacs-data usr/share/doc/copyright usr/share/doc/COPYING
# one lintian warning is overridden:
# - script-not-executable: demo scripts outside of $PATH
dh_lintian -pgromacs-data
......
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