[med-svn] r22667 - trunk/packages/mrs/trunk/debian

[Andreas Tille]

Author: tille
Date: 2016-08-12 11:27:16 +0000 (Fri, 12 Aug 2016)
New Revision: 22667

Modified:
   trunk/packages/mrs/trunk/debian/changelog
   trunk/packages/mrs/trunk/debian/control
   trunk/packages/mrs/trunk/debian/rules
   trunk/packages/mrs/trunk/debian/watch
Log:
Some polishing before uploading to fix gcc-6 issue


Modified: trunk/packages/mrs/trunk/debian/changelog
===================================================================
--- trunk/packages/mrs/trunk/debian/changelog	2016-08-12 09:08:40 UTC (rev 22666)
+++ trunk/packages/mrs/trunk/debian/changelog	2016-08-12 11:27:16 UTC (rev 22667)
@@ -1,12 +1,15 @@
-mrs (6.0.5+dfsg-2) UNRELEASED; urgency=medium
+mrs (6.0.5+dfsg-2) unstable; urgency=medium
 
   [Andreas Tille]
   * cme fix dpkg-control
+  * hardening=+all
+  * d/watch: xz compressed repackaged tarball
 
   [Gert Wollny]
-  * d/p/gcc-6.patch fix compilation with gcc-6, Related: #816569
+  * d/p/gcc-6.patch fix compilation with gcc-6
+    Closes: #816569
 
- -- Andreas Tille <tille at debian.org>  Tue, 26 Apr 2016 09:29:33 +0200
+ -- Andreas Tille <tille at debian.org>  Fri, 12 Aug 2016 13:01:30 +0200
 
 mrs (6.0.5+dfsg-1) unstable; urgency=medium
 

Modified: trunk/packages/mrs/trunk/debian/control
===================================================================
--- trunk/packages/mrs/trunk/debian/control	2016-08-12 09:08:40 UTC (rev 22666)
+++ trunk/packages/mrs/trunk/debian/control	2016-08-12 11:27:16 UTC (rev 22667)
@@ -24,7 +24,7 @@
                libjs-jquery,
                libjs-jquery-ui
 Standards-Version: 3.9.8
-Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/mrs/trunk/
+Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/mrs/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/mrs/trunk/
 Homepage: http://mrs.cmbi.ru.nl/
 

Modified: trunk/packages/mrs/trunk/debian/rules
===================================================================
--- trunk/packages/mrs/trunk/debian/rules	2016-08-12 09:08:40 UTC (rev 22666)
+++ trunk/packages/mrs/trunk/debian/rules	2016-08-12 11:27:16 UTC (rev 22667)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 DH_VERBOSE := 1
 
 %:
@@ -9,6 +11,3 @@
 	./configure --prefix=/usr --config-dir=/etc/mrs/ \
 		--man-dir=/usr/share/man --mrs-user=mrs-dba \
 		--data-dir=/var/lib/mrs --log-dir=/var/log/mrs
-		
-get-orig-source:
-	uscan --verbose --force-download --repack --compress xz

Modified: trunk/packages/mrs/trunk/debian/watch
===================================================================
--- trunk/packages/mrs/trunk/debian/watch	2016-08-12 09:08:40 UTC (rev 22666)
+++ trunk/packages/mrs/trunk/debian/watch	2016-08-12 11:27:16 UTC (rev 22667)
@@ -1,3 +1,3 @@
 version=3
-opts="pasv,uversionmangle=s/$/+dfsg/" \
+opts="pasv,repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \
 	  ftp://ftp.cmbi.ru.nl/pub/software/mrs/mrs-([0-9.]+).t[bg]z