[med-svn] r4349 - trunk/packages/R/r-cran-epitools/trunk/debian

[Andreas Tille]

Author: tille
Date: 2009-11-19 14:32:02 +0000 (Thu, 19 Nov 2009)
New Revision: 4349

Removed:
   trunk/packages/R/r-cran-epitools/trunk/debian/get-orig-source
Modified:
   trunk/packages/R/r-cran-epitools/trunk/debian/changelog
   trunk/packages/R/r-cran-epitools/trunk/debian/rules
   trunk/packages/R/r-cran-epitools/trunk/debian/watch
Log:
New upstream version - switch to original version numbering
    of upstream containing a dash ('-') as agreed with other
    maintainers of R packages.


Modified: trunk/packages/R/r-cran-epitools/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-epitools/trunk/debian/changelog	2009-11-19 13:41:12 UTC (rev 4348)
+++ trunk/packages/R/r-cran-epitools/trunk/debian/changelog	2009-11-19 14:32:02 UTC (rev 4349)
@@ -1,3 +1,11 @@
+r-cran-epitools (1:0.5-4-1) unstable; urgency=low
+
+  * New upstream version - switch to original version numbering
+    of upstream containing a dash ('-') as agreed with other
+    maintainers of R packages.
+
+ -- Andreas Tille <tille at debian.org>  Thu, 19 Nov 2009 15:23:56 +0100
+
 r-cran-epitools (0.5.3-2) unstable; urgency=low
 
   * Rebuilt against R 2.10.0 (new documentation system).

Deleted: trunk/packages/R/r-cran-epitools/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/R/r-cran-epitools/trunk/debian/get-orig-source	2009-11-19 13:41:12 UTC (rev 4348)
+++ trunk/packages/R/r-cran-epitools/trunk/debian/get-orig-source	2009-11-19 14:32:02 UTC (rev 4349)
@@ -1,7 +0,0 @@
-#!/bin/sh
-PKG=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-RENAME=`uscan --verbose --force-download | \
-   grep "Newest version on remote site is .* local version is .*" | \
-   head -n 1 | \
-   sed "s?Newest .* \([-0-9.]\+\),.* \([0-9.]\+\)?mv ../${PKG}_\1.orig.tar.gz ../${PKG}_\2.orig.tar.gz?"`
-$RENAME

Modified: trunk/packages/R/r-cran-epitools/trunk/debian/rules
===================================================================
--- trunk/packages/R/r-cran-epitools/trunk/debian/rules	2009-11-19 13:41:12 UTC (rev 4348)
+++ trunk/packages/R/r-cran-epitools/trunk/debian/rules	2009-11-19 14:32:02 UTC (rev 4349)
@@ -4,6 +4,3 @@
 # Copyright 2008 by Andreas Tille <tille at debian.org>
 
 include /usr/share/R/debian/r-cran.mk
-
-get-orig-source:
-	. debian/get-orig-source

Modified: trunk/packages/R/r-cran-epitools/trunk/debian/watch
===================================================================
--- trunk/packages/R/r-cran-epitools/trunk/debian/watch	2009-11-19 13:41:12 UTC (rev 4348)
+++ trunk/packages/R/r-cran-epitools/trunk/debian/watch	2009-11-19 14:32:02 UTC (rev 4349)
@@ -1,6 +1,6 @@
 version=3
-# Same effect as dversionmangle, but we have to rename the orig.tar.gz
-# anyway and it is easier to write a get-origsource script this way
-# opts="uversionmangle=s/([\d.]+)-(\d)/$1.$2/"
-opts="dversionmangle=s/([\d.]+)\.(\d)/$1-$2/" \
-http://cran.r-project.org/src/contrib/epitools_([-\d.]*)\.tar\.gz
+# Stay with the original version numbering even if it contains a dash
+# as agreed with other maintainers of R packages and it should be mentioned
+# in a Debian R policy
+# opts="dversionmangle=s/([\d.]+)\.(\d)/$1-$2/" \
+http://cran.r-project.org/src/contrib/epitools_([-\d.]+)\.tar\.gz