[med-svn] r23315 - trunk/packages/R/r-cran-rncl/trunk/debian

[Andreas Tille]

Author: tille
Date: 2016-12-18 08:00:28 +0000 (Sun, 18 Dec 2016)
New Revision: 23315

Modified:
   trunk/packages/R/r-cran-rncl/trunk/debian/changelog
   trunk/packages/R/r-cran-rncl/trunk/debian/compat
   trunk/packages/R/r-cran-rncl/trunk/debian/control
   trunk/packages/R/r-cran-rncl/trunk/debian/copyright
   trunk/packages/R/r-cran-rncl/trunk/debian/rules
   trunk/packages/R/r-cran-rncl/trunk/debian/watch
Log:
  * New upstream version
  * debhelper 10
  * d/watch: version=4
  * Convert to dh-r
  * Canonical homepage for CRAN
Unable to upload since r-base-core is broken in pbuilder


Modified: trunk/packages/R/r-cran-rncl/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-rncl/trunk/debian/changelog	2016-12-17 21:52:50 UTC (rev 23314)
+++ trunk/packages/R/r-cran-rncl/trunk/debian/changelog	2016-12-18 08:00:28 UTC (rev 23315)
@@ -1,3 +1,13 @@
+r-cran-rncl (0.8.2-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+  * debhelper 10
+  * d/watch: version=4
+  * Convert to dh-r
+  * Canonical homepage for CRAN
+
+ -- Andreas Tille <tille at debian.org>  Sun, 18 Dec 2016 08:18:13 +0100
+
 r-cran-rncl (0.6.0-2) unstable; urgency=medium
 
   * Add missing Dependency: r-cran-rcpp

Modified: trunk/packages/R/r-cran-rncl/trunk/debian/compat
===================================================================
--- trunk/packages/R/r-cran-rncl/trunk/debian/compat	2016-12-17 21:52:50 UTC (rev 23314)
+++ trunk/packages/R/r-cran-rncl/trunk/debian/compat	2016-12-18 08:00:28 UTC (rev 23315)
@@ -1 +1 @@
-9
+10

Modified: trunk/packages/R/r-cran-rncl/trunk/debian/control
===================================================================
--- trunk/packages/R/r-cran-rncl/trunk/debian/control	2016-12-17 21:52:50 UTC (rev 23314)
+++ trunk/packages/R/r-cran-rncl/trunk/debian/control	2016-12-18 08:00:28 UTC (rev 23315)
@@ -3,21 +3,22 @@
 Uploaders: Andreas Tille <tille at debian.org>
 Section: gnu-r
 Priority: optional
-Build-Depends: debhelper (>= 9),
-               cdbs,
+Build-Depends: debhelper (>= 10),
+               dh-r,
                r-base-dev,
                r-cran-rcpp
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-cran-rncl/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/R/r-cran-rncl/trunk/
-Homepage: https://cran.r-project.org/web/packages/rncl/
+Homepage: https://cran.r-project.org/package=rncl
 
 Package: r-cran-rncl
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         ${R:Depends},
-         r-cran-rcpp
+         ${R:Depends}
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests}
 Description: GNU R interface to the Nexus Class Library
  This R package provides an interface to the Nexus Class Library which
  allows parsing of NEXUS, Newick and other phylogenetic tree file

Modified: trunk/packages/R/r-cran-rncl/trunk/debian/copyright
===================================================================
--- trunk/packages/R/r-cran-rncl/trunk/debian/copyright	2016-12-17 21:52:50 UTC (rev 23314)
+++ trunk/packages/R/r-cran-rncl/trunk/debian/copyright	2016-12-18 08:00:28 UTC (rev 23315)
@@ -1,9 +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-Contact: Francois Michonneau <francois.michonneau at gmail.com>
-Source: https://cran.r-project.org/web/packages/rncl/
+Upstream-Name: rncl
+Source: https://cran.r-project.org/package=rncl
 
 Files: *
-Copyright: 2013-2015 Francois Michonneau, Ben Bolker, Mark Holder, Paul Lewis, Brian O'Meara
+Copyright: 2013-2016 Francois Michonneau, Ben Bolker, Mark Holder, Paul Lewis, Brian O'Meara
 License: BSD-2-clause
 
 Files: debian/*

Modified: trunk/packages/R/r-cran-rncl/trunk/debian/rules
===================================================================
--- trunk/packages/R/r-cran-rncl/trunk/debian/rules	2016-12-17 21:52:50 UTC (rev 23314)
+++ trunk/packages/R/r-cran-rncl/trunk/debian/rules	2016-12-18 08:00:28 UTC (rev 23315)
@@ -1,7 +1,12 @@
 #!/usr/bin/make -f
 
-include /usr/share/R/debian/r-cran.mk
+%:
+	dh $@ --buildsystem R
 
-install/$(package)::
-	rm -rf debian/$(package)/usr/lib/R/site-library/$(cranName)/LICENSE
-	chmod 644 debian/$(package)/usr/lib/R/site-library/$(cranName)/nexusfiles/co1.nex
+override_dh_install:
+	dh_install
+	find debian -name LICENSE -delete
+
+override_dh_fixperms:
+	dh_fixperms
+	find debian -name "*.nex" -exec chmod -x \{\} \;

Modified: trunk/packages/R/r-cran-rncl/trunk/debian/watch
===================================================================
--- trunk/packages/R/r-cran-rncl/trunk/debian/watch	2016-12-17 21:52:50 UTC (rev 23314)
+++ trunk/packages/R/r-cran-rncl/trunk/debian/watch	2016-12-18 08:00:28 UTC (rev 23315)
@@ -1,3 +1,3 @@
-version=3
+version=4
 http://cran.r-project.org/src/contrib/rncl_([-0-9\.]*).tar.gz