[med-svn] r23002 - trunk/packages/R/r-cran-rsolnp/trunk/debian

[Andreas Tille]

Author: tille
Date: 2016-11-06 08:56:42 +0000 (Sun, 06 Nov 2016)
New Revision: 23002

Modified:
   trunk/packages/R/r-cran-rsolnp/trunk/debian/changelog
   trunk/packages/R/r-cran-rsolnp/trunk/debian/control
   trunk/packages/R/r-cran-rsolnp/trunk/debian/copyright
   trunk/packages/R/r-cran-rsolnp/trunk/debian/rules
   trunk/packages/R/r-cran-rsolnp/trunk/debian/watch
Log:
  * New upstream version
  * xz compression in d/watch
  * Convert to dh-r
  * Canonical homepage for CRAN



Modified: trunk/packages/R/r-cran-rsolnp/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-rsolnp/trunk/debian/changelog	2016-11-04 14:15:26 UTC (rev 23001)
+++ trunk/packages/R/r-cran-rsolnp/trunk/debian/changelog	2016-11-06 08:56:42 UTC (rev 23002)
@@ -1,3 +1,12 @@
+r-cran-rsolnp (1.16+dfsg-1) unstable; urgency=medium
+
+  * New upstream version
+  * xz compression in d/watch
+  * Convert to dh-r
+  * Canonical homepage for CRAN
+
+ -- Andreas Tille <tille at debian.org>  Sun, 06 Nov 2016 09:45:21 +0100
+
 r-cran-rsolnp (1.14+dfsg-1) unstable; urgency=low
 
   * Initial release (closes: #753125)

Modified: trunk/packages/R/r-cran-rsolnp/trunk/debian/control
===================================================================
--- trunk/packages/R/r-cran-rsolnp/trunk/debian/control	2016-11-04 14:15:26 UTC (rev 23001)
+++ trunk/packages/R/r-cran-rsolnp/trunk/debian/control	2016-11-06 08:56:42 UTC (rev 23002)
@@ -4,19 +4,21 @@
 Section: gnu-r
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               cdbs,
+               dh-r,
                r-base-dev,
                r-cran-truncnorm
-Standards-Version: 3.9.5
-Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-cran-rsolnp/trunk/
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-cran-rsolnp/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/R/r-cran-rsolnp/trunk/
-Homepage: http://cran.r-project.org/web/packages/Rsolnp
+Homepage: https://cran.r-project.org/package=Rsolnp
 
 Package: r-cran-rsolnp
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${R:Depends},
-         r-cran-truncnorm
+         ${misc:Depends},
+         ${R:Depends}
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests}
 Description: GNU R general non-linear optimization
  This GNU R package provides general non-linear optimization using
  augmented lagrange multiplier method

Modified: trunk/packages/R/r-cran-rsolnp/trunk/debian/copyright
===================================================================
--- trunk/packages/R/r-cran-rsolnp/trunk/debian/copyright	2016-11-04 14:15:26 UTC (rev 23001)
+++ trunk/packages/R/r-cran-rsolnp/trunk/debian/copyright	2016-11-06 08:56:42 UTC (rev 23002)
@@ -1,15 +1,15 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Rsolnp
 Upstream-Contact: Alexios Ghalanos <alexios at 4dscape.com>
-Source: http://cran.r-project.org/web/packages/Rsolnp/
+Source: https://cran.r-project.org/package=Rsolnp
 Files-Excluded: inst/doc/manual.ps
 
 Files: *
-Copyright: 2012-2014 Alexios Ghalanos, Stefan Theussl
+Copyright: 2012-2016 Alexios Ghalanos, Stefan Theussl
 License: GPL-3+
 
 Files: debian/*
-Copyright: 2014 Andreas Tille <tille at debian.org>
+Copyright: 2014-2016 Andreas Tille <tille at debian.org>
 License: GPL-3+
 
 License: GPL-3+
@@ -26,6 +26,6 @@
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
- On Debian systems, the complete text of the GNU Public
+ On Debian systems, the complete text of the GNU General Public
  License can be found in `/usr/share/common-licenses/GPL-3'.
 

Modified: trunk/packages/R/r-cran-rsolnp/trunk/debian/rules
===================================================================
--- trunk/packages/R/r-cran-rsolnp/trunk/debian/rules	2016-11-04 14:15:26 UTC (rev 23001)
+++ trunk/packages/R/r-cran-rsolnp/trunk/debian/rules	2016-11-06 08:56:42 UTC (rev 23002)
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
 
-include /usr/share/R/debian/r-cran.mk
-
-get-orig-source:
-	uscan --verbose --force-download --repack --compression xz
+%:
+	dh $@ --buildsystem R

Modified: trunk/packages/R/r-cran-rsolnp/trunk/debian/watch
===================================================================
--- trunk/packages/R/r-cran-rsolnp/trunk/debian/watch	2016-11-04 14:15:26 UTC (rev 23001)
+++ trunk/packages/R/r-cran-rsolnp/trunk/debian/watch	2016-11-06 08:56:42 UTC (rev 23002)
@@ -1,3 +1,3 @@
 version=3
-opts=uversionmangle=s/$/+dfsg/ \
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \
   http://cran.r-project.org/src/contrib/Rsolnp_([-\d.]*)\.tar\.gz