[med-svn] r23022 - trunk/packages/R/r-cran-fastcluster/trunk/debian

[Andreas Tille]

Author: tille
Date: 2016-11-08 17:34:45 +0000 (Tue, 08 Nov 2016)
New Revision: 23022

Modified:
   trunk/packages/R/r-cran-fastcluster/trunk/debian/changelog
   trunk/packages/R/r-cran-fastcluster/trunk/debian/control
   trunk/packages/R/r-cran-fastcluster/trunk/debian/copyright
   trunk/packages/R/r-cran-fastcluster/trunk/debian/rules
Log:
  * New upstream version
  * Convert to dh-r
  * Canonical homepage for CRAN
  * Add new Build-Depends: python-setuptools, python3-setuptools,



Modified: trunk/packages/R/r-cran-fastcluster/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-fastcluster/trunk/debian/changelog	2016-11-08 17:10:27 UTC (rev 23021)
+++ trunk/packages/R/r-cran-fastcluster/trunk/debian/changelog	2016-11-08 17:34:45 UTC (rev 23022)
@@ -1,3 +1,12 @@
+r-cran-fastcluster (1.1.21-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+  * Convert to dh-r
+  * Canonical homepage for CRAN
+  * Add new Build-Depends: python-setuptools, python3-setuptools,
+
+ -- Andreas Tille <tille at debian.org>  Tue, 08 Nov 2016 09:34:09 +0100
+
 r-cran-fastcluster (1.1.16-2) unstable; urgency=medium
 
   * Create Python modules as well (Thanks for the hint to Gard Spreemann

Modified: trunk/packages/R/r-cran-fastcluster/trunk/debian/control
===================================================================
--- trunk/packages/R/r-cran-fastcluster/trunk/debian/control	2016-11-08 17:10:27 UTC (rev 23021)
+++ trunk/packages/R/r-cran-fastcluster/trunk/debian/control	2016-11-08 17:34:45 UTC (rev 23022)
@@ -5,21 +5,26 @@
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-python,
+               dh-r,
                r-base-dev,
                python-dev,
                python-numpy,
+               python-setuptools,
                python3-dev,
-               python3-numpy
-Standards-Version: 3.9.6
+               python3-numpy,
+               python3-setuptools
+Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-cran-fastcluster/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/R/r-cran-fastcluster/trunk/
-Homepage: http://cran.r-project.org/web/packages/fastcluster/index.html
+Homepage: https://cran.r-project.org/package=fastcluster
 
 Package: r-cran-fastcluster
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${R:Depends}
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests}
 Description: Fast hierarchical clustering routines for GNU R
  Fastcluster implements fast hierarchical, agglomerative clustering
  routines. Part of the functionality is designed as drop-in replacement

Modified: trunk/packages/R/r-cran-fastcluster/trunk/debian/copyright
===================================================================
--- trunk/packages/R/r-cran-fastcluster/trunk/debian/copyright	2016-11-08 17:10:27 UTC (rev 23021)
+++ trunk/packages/R/r-cran-fastcluster/trunk/debian/copyright	2016-11-08 17:34:45 UTC (rev 23022)
@@ -1,10 +1,10 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: fastcluster
 Upstream-Contact: Daniel Müllner <muellner at math.stanford.edu>
-Source: http://cran.r-project.org/src/contrib/
+Source: https://cran.r-project.org/package=fastcluster
 
 Files: *
-Copyright: 2011-2013 Daniel Müllner <muellner at math.stanford.edu>
+Copyright: 2011-2016 Daniel Müllner <muellner at math.stanford.edu>
 License: BSDlike
 
 License: BSDlike
@@ -31,6 +31,6 @@
  /usr/share/common-licenses/GPL-2
 
 Files: debian/*
-Copyright: 2013 Andreas Tille <tille at debian.org>
+Copyright: 2013-2016 Andreas Tille <tille at debian.org>
 License: BSDlike
 

Modified: trunk/packages/R/r-cran-fastcluster/trunk/debian/rules
===================================================================
--- trunk/packages/R/r-cran-fastcluster/trunk/debian/rules	2016-11-08 17:10:27 UTC (rev 23021)
+++ trunk/packages/R/r-cran-fastcluster/trunk/debian/rules	2016-11-08 17:34:45 UTC (rev 23022)
@@ -4,16 +4,12 @@
 
 export PYBUILD_NAME=fastcluster
 
-cranName=fastcluster
-R_PATH=/usr/lib/R/site-library
-R_NAME=r-cran-$(cranName)
-
 # Taken from CDBS file for R.
 rversion	:= $(shell dpkg-query -W -f='$${Version}' r-base-dev)
 rapiversion	:= $(shell dpkg-query -W -f='$${Provides}' r-base-core | grep -o 'r-api[^, ]*')
 
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild --sourcedirectory=src/python 
+	dh $@  --buildsystem R --with python2,python3 --buildsystem=pybuild --sourcedirectory=src/python 
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -37,6 +33,5 @@
 override_dh_install:
 	dh_numpy
 	dh_numpy3
-	echo "R:Depends=r-base-core (>= ${rversion}), ${rapiversion}" >> debian/$(R_NAME).substvars
 	dh_install
-	rm -rf debian/$(R_NAME)/usr/lib/R/site-library/$(cranName)/LICENSE
+	find debian -name LICENSE -delete