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

[Andreas Tille]

Author: tille
Date: 2014-10-02 08:30:33 +0000 (Thu, 02 Oct 2014)
New Revision: 18187

Modified:
   trunk/packages/mrs/trunk/debian/changelog
   trunk/packages/mrs/trunk/debian/control
   trunk/packages/mrs/trunk/debian/copyright
   trunk/packages/mrs/trunk/debian/rules
   trunk/packages/mrs/trunk/debian/watch
Log:
New upstream version, document removed code from source tarball via Files-Excluded


Modified: trunk/packages/mrs/trunk/debian/changelog
===================================================================
--- trunk/packages/mrs/trunk/debian/changelog	2014-10-02 07:29:55 UTC (rev 18186)
+++ trunk/packages/mrs/trunk/debian/changelog	2014-10-02 08:30:33 UTC (rev 18187)
@@ -1,3 +1,11 @@
+mrs (6.0.5+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+  * Document removed code from source tarball via Files-Excluded
+  * d/rules: get-orig-source now cares for repackaging via uscan
+
+ -- Andreas Tille <tille at debian.org>  Thu, 02 Oct 2014 10:05:43 +0200
+
 mrs (6.0.4+dfsg-1) unstable; urgency=low
 
   * Updated license information, again

Modified: trunk/packages/mrs/trunk/debian/control
===================================================================
--- trunk/packages/mrs/trunk/debian/control	2014-10-02 07:29:55 UTC (rev 18186)
+++ trunk/packages/mrs/trunk/debian/control	2014-10-02 08:30:33 UTC (rev 18187)
@@ -2,6 +2,7 @@
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Maarten L. Hekkelman <m.hekkelman at cmbi.ru.nl>,
+           Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 9.0),
                libboost-dev (>= 1.49.0),
                libboost-filesystem-dev (>= 1.49.0), 

Modified: trunk/packages/mrs/trunk/debian/copyright
===================================================================
--- trunk/packages/mrs/trunk/debian/copyright	2014-10-02 07:29:55 UTC (rev 18186)
+++ trunk/packages/mrs/trunk/debian/copyright	2014-10-02 08:30:33 UTC (rev 18187)
@@ -2,6 +2,12 @@
 Upstream-Name: mrs
 Upstream-Contact: Maarten L. Hekkelman <m.hekkelman at cmbi.ru.nl>
 Source: http://mrs.cmbi.ru.nl/
+Files-Excluded: msvc
+                docroot/css/jquery-ui.css
+                docroot/css/base
+                docroot/css/images
+                docroot/css/theme
+                docroot/scripts/jquery*
 
 Files: debian/*
 Copyright: © 2013, Maarten L. Hekkelman <m.hekkelman at cmbi.ru.nl>

Modified: trunk/packages/mrs/trunk/debian/rules
===================================================================
--- trunk/packages/mrs/trunk/debian/rules	2014-10-02 07:29:55 UTC (rev 18186)
+++ trunk/packages/mrs/trunk/debian/rules	2014-10-02 08:30:33 UTC (rev 18187)
@@ -19,11 +19,6 @@
 DTYPE = +dfsg
 VER  ?= $(subst $(DTYPE),,$(UVER))
 
-.PHONY: get-orig-source
-
-get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYPE))
-	@
-
 $(PKG)_$(VER)$(DTYPE).orig.tar.xz:
 	@echo "# Downloading..."
 	mkdir -p ../tarballs
@@ -48,3 +43,6 @@
 	cd ../tarballs && find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
 		| XZ_OPT="-6v" tar -caf "../tarballs/$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
 		&& $(RM) -r "../tarballs/$(PKG)-$(VER)"
+
+get-orig-source:
+	uscan --verbose --force-download --repack --compress xz

Modified: trunk/packages/mrs/trunk/debian/watch
===================================================================
--- trunk/packages/mrs/trunk/debian/watch	2014-10-02 07:29:55 UTC (rev 18186)
+++ trunk/packages/mrs/trunk/debian/watch	2014-10-02 08:30:33 UTC (rev 18187)
@@ -1,3 +1,3 @@
 version=3
-opts="pasv,dversionmangle=s/\+dfsg//" \
-	  ftp://ftp.cmbi.ru.nl/pub/software/mrs/mrs-([0-9.]+).t[bg]z  debian uupdate
+opts="pasv,uversionmangle=s/$/+dfsg/" \
+	  ftp://ftp.cmbi.ru.nl/pub/software/mrs/mrs-([0-9.]+).t[bg]z