[med-svn] [Git][med-team/loki][master] 7 commits: debhelper 11

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / loki


Commits:
086e207d by Andreas Tille at 2018-10-11T18:27:07Z
debhelper 11

- - - - -
ec2abc60 by Andreas Tille at 2018-10-11T18:27:10Z
Point Vcs fields to salsa.debian.org

- - - - -
6899d57f by Andreas Tille at 2018-10-11T18:27:10Z
Standards-Version: 4.2.1

- - - - -
409530a6 by Andreas Tille at 2018-10-12T05:00:28Z
Fix doc location

- - - - -
f54fea8e by Andreas Tille at 2018-10-12T05:01:22Z
hardening=+all

- - - - -
c7e32fd0 by Andreas Tille at 2018-10-12T05:04:48Z
Fix spelling

- - - - -
4fc3eb96 by Andreas Tille at 2018-10-12T05:06:17Z
Upload to unstable

- - - - -


8 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/loki-doc.doc-base.lokifaq
- debian/loki-doc.doc-base.lokimanual
- debian/patches/series
- + debian/patches/spelling.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+loki (2.4.7.4-8) unstable; urgency=medium
+
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.2.1
+  * hardening=+all
+  * Fix spelling
+
+ -- Andreas Tille <tille at debian.org>  Fri, 12 Oct 2018 07:04:58 +0200
+
 loki (2.4.7.4-7) unstable; urgency=medium
 
   * Moved packaging from SVN to Git


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
@@ -3,10 +3,10 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 10)
-Standards-Version: 4.1.1
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/loki.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/loki.git
+Build-Depends: debhelper (>= 11~)
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/med-team/loki
+Vcs-Git: https://salsa.debian.org/med-team/loki.git
 
 Package: loki
 Architecture: any


=====================================
debian/loki-doc.doc-base.lokifaq
=====================================
@@ -6,4 +6,4 @@ Abstract: This document answers frequently
 Section: Science/Biology
 
 Format: postscript
-Files: /usr/share/doc/loki-doc/loki_faq.ps.gz
+Files: /usr/share/doc/loki/loki_faq.ps.gz


=====================================
debian/loki-doc.doc-base.lokimanual
=====================================
@@ -7,4 +7,4 @@ Abstract: This manual describes what loki is
 Section: Science/Biology
 
 Format: postscript
-Files: /usr/share/doc/loki-doc/loki_doc.ps.gz
+Files: /usr/share/doc/loki/loki_doc.ps.gz


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 10_utils.patch
 10_lex.patch
 hardening.patch
+spelling.patch


=====================================
debian/patches/spelling.patch
=====================================
@@ -0,0 +1,26 @@
+Description: Fix spelling
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 11 Oct 2018 20:27:07 +0200
+
+--- a/lokisrc/param_parse.c
++++ b/lokisrc/param_parse.c
+@@ -2519,7 +2519,7 @@ int ReadParam(FILE *fptr,char *cname,int
+ 		scan_error_n++;
+ 	}
+ 	if(n_models>1 && output_type<2) {
+-		(void)fprintf(stderr,"ReadParam(): Ouput type %d not supported with multilpe trait loci\n",output_type);
++		(void)fprintf(stderr,"ReadParam(): Output type %d not supported with multiple trait loci\n",output_type);
+ 		scan_error_n++;
+ 	}
+ 	if(!syst_var[SYST_IBD_OUTPUT].flag) {
+--- a/lokisrc/param_parse.y
++++ b/lokisrc/param_parse.y
+@@ -852,7 +852,7 @@ int ReadParam(FILE *fptr,char *cname,int
+ 		scan_error_n++;
+ 	}
+ 	if(n_models>1 && output_type<2) {
+-		(void)fprintf(stderr,"ReadParam(): Ouput type %d not supported with multilpe trait loci\n",output_type);
++		(void)fprintf(stderr,"ReadParam(): Output type %d not supported with multiple trait loci\n",output_type);
+ 		scan_error_n++;
+ 	}
+ 	if(!syst_var[SYST_IBD_OUTPUT].flag) {


=====================================
debian/rules
=====================================
@@ -4,6 +4,8 @@
 
 include /usr/share/dpkg/default.mk
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 MANPAGES=check_het.1 \
          hist.1 \
          loki_count.1 \



View it on GitLab: https://salsa.debian.org/med-team/loki/compare/e90c8e64ec32950d63253b093340c923ffeec0f5...4fc3eb96d865bff5757bf37f5ba5861a7b319049

-- 
View it on GitLab: https://salsa.debian.org/med-team/loki/compare/e90c8e64ec32950d63253b093340c923ffeec0f5...4fc3eb96d865bff5757bf37f5ba5861a7b319049
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/20181012/2d95f95b/attachment-0001.html>