[med-svn] [Git][med-team/dssp][master] last minute changes

[Maarten L. Hekkelman]

Maarten L. Hekkelman pushed to branch master at Debian Med / dssp


Commits:
86a9daa5 by Maarten L. Hekkelman at 2020-11-24T14:30:07+01:00
last minute changes

- - - - -


7 changed files:

- GNUmakefile.in
- debian/control
- + debian/patches/configure-patch
- debian/patches/man-patch
- debian/patches/series
- debian/rules
- debian/tests/installation-test


Changes:

=====================================
GNUmakefile.in
=====================================
@@ -35,7 +35,7 @@ LIBS				= @LIBS@ \
 					  @BOOST_PROGRAM_OPTIONS_LIB@ \
 					  @BOOST_DATE_TIME_LIB@
 
-prefix				= $(DESTDIR)@prefix@
+prefix				= @prefix@
 exec_prefix			= @exec_prefix@
 bindir				= @bindir@
 datarootdir			= @datarootdir@


=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Maarten L. Hekkelman <maarten at hekkelman.com>
 Section: science
 Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
                libboost-iostreams-dev,
                libboost-program-options-dev,
                libboost-system-dev,


=====================================
debian/patches/configure-patch
=====================================
@@ -0,0 +1,38 @@
+Description: Fix man page for mkdssp
+Author: Maarten L. Hekkelman <maarten at hekkelman.com>
+Last-Update: Tue, 24 Nov 2020 14:17:09 +0100
+Forwarded: yes
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,15 +23,28 @@
+ 
+ AC_ARG_VAR([MRC], [Specify a location for the mrc executable])
+ 
+-dnl We would like to use mrc
++USE_RSRC=0
++
+ if test "x$MRC" = "x"; then
+ 	AC_PATH_PROG([MRC], [mrc])
+ fi
+ 
+ if test "x$MRC" = "x"; then
+-	AC_MSG_ERROR([mrc not found, the application will be built without resources])
++	AC_MSG_WARN([The mrc application was not found, not using resources.])
++else
++	AC_ARG_ENABLE(
++		resources,
++		[AS_HELP_STRING([--disable-resources], [Do not use mrc to store data in resources])])
++
++	AS_IF([test "x$enable_resources" != "xno" ], [
++		USE_RSRC=1
++	])
+ fi
+ 
++AC_SUBST([USE_RSRC], [$USE_RSRC])
++
++AC_DEFINE_UNQUOTED([USE_RSRC], [$USE_RSRC], [Use mrc to store resources])
++
+ dnl revision numbering is something used internally at the NKI
+ AC_ARG_ENABLE(
+ 	revision,


=====================================
debian/patches/man-patch
=====================================
@@ -1,3 +1,8 @@
+Description: Fix man page for mkdssp
+Author: Maarten L. Hekkelman <maarten at hekkelman.com>
+Last-Update: Tue, 24 Nov 2020 11:29:28 +0100
+Forwarded: yes
+
 --- a/mkdssp.1
 +++ b/mkdssp.1
 @@ -21,7 +21,7 @@
@@ -15,7 +20,7 @@
  S	BEND	Bend
 -' '	OTHER	Loop
 +T{
-+\' \' (space)
++\(aq \(aq (space)
 +T}	OTHER	Loop
  .TE
  .SH BUGS


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 man-patch
 makefile
+configure-patch


=====================================
debian/rules
=====================================
@@ -15,4 +15,4 @@ export LDOPTS:=$(LDFLAGS)
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-revision
+	dh_auto_configure -- --disable-resources --disable-revision


=====================================
debian/tests/installation-test
=====================================
@@ -9,13 +9,13 @@ if [ "$AUTOPKGTEST_TMP" = "" ] ; then
   trap "rm -rf $AUTOPKGTEST_TMP" 0 INT QUIT ABRT PIPE TERM
 fi
 
-cp debian/tests/1cbs.cif.gz $AUTOPKGTEST_TMP
+cp debian/tests/1cbs.cif $AUTOPKGTEST_TMP
 
 cd $AUTOPKGTEST_TMP
 
 # simply run mkdssp on 1cbs, should produce an output file
-mkdssp 1cbs.cif.gz 1cbs-dssp.cif
+mkdssp 1cbs.cif 1cbs-dssp.cif
 [ -s 1cbs-dssp.cif ]
 
-mkdssp 1cbs.cif.gz 1cbs-dssp.dssp
+mkdssp 1cbs.cif 1cbs-dssp.dssp
 [ -s 1cbs-dssp.dssp ]



View it on GitLab: https://salsa.debian.org/med-team/dssp/-/commit/86a9daa529d18d66f116f4de47f86e9e0dba771b

-- 
View it on GitLab: https://salsa.debian.org/med-team/dssp/-/commit/86a9daa529d18d66f116f4de47f86e9e0dba771b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201124/1896b02a/attachment-0001.html>