[med-svn] r13012 - in trunk/packages/R/r-cran-rcurl/trunk/debian: . patches
Ivo Maintz
ivomaintz-guest at alioth.debian.org
Fri Feb 15 09:44:11 UTC 2013
Author: ivomaintz-guest
Date: 2013-02-15 09:44:11 +0000 (Fri, 15 Feb 2013)
New Revision: 13012
Added:
trunk/packages/R/r-cran-rcurl/trunk/debian/docs
trunk/packages/R/r-cran-rcurl/trunk/debian/patches/
trunk/packages/R/r-cran-rcurl/trunk/debian/patches/hardening
trunk/packages/R/r-cran-rcurl/trunk/debian/patches/series
trunk/packages/R/r-cran-rcurl/trunk/debian/upstream
Modified:
trunk/packages/R/r-cran-rcurl/trunk/debian/changelog
trunk/packages/R/r-cran-rcurl/trunk/debian/compat
trunk/packages/R/r-cran-rcurl/trunk/debian/control
trunk/packages/R/r-cran-rcurl/trunk/debian/copyright
trunk/packages/R/r-cran-rcurl/trunk/debian/rules
trunk/packages/R/r-cran-rcurl/trunk/debian/watch
Log:
updated the package to new upstream version
added hardening patch
should be ready for upload
Modified: trunk/packages/R/r-cran-rcurl/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-rcurl/trunk/debian/changelog 2013-02-15 09:36:18 UTC (rev 13011)
+++ trunk/packages/R/r-cran-rcurl/trunk/debian/changelog 2013-02-15 09:44:11 UTC (rev 13012)
@@ -1,3 +1,13 @@
+rcurl (1.95.3-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * added a hardening patch
+ * installs Changes.html as upstream changelog
+ * updated debian/copyright
+ * updated debian/watch
+
+ -- Ivo Maintz <ivo at maintz.de> Fri, 15 Feb 2013 10:29:12 +0100
+
r-cran-rcurl (1.91-1-1) UNRELEASED; urgency=low
* Initial packaging.
Modified: trunk/packages/R/r-cran-rcurl/trunk/debian/compat
===================================================================
--- trunk/packages/R/r-cran-rcurl/trunk/debian/compat 2013-02-15 09:36:18 UTC (rev 13011)
+++ trunk/packages/R/r-cran-rcurl/trunk/debian/compat 2013-02-15 09:44:11 UTC (rev 13012)
@@ -1 +1 @@
-8
+9
Modified: trunk/packages/R/r-cran-rcurl/trunk/debian/control
===================================================================
--- trunk/packages/R/r-cran-rcurl/trunk/debian/control 2013-02-15 09:36:18 UTC (rev 13011)
+++ trunk/packages/R/r-cran-rcurl/trunk/debian/control 2013-02-15 09:44:11 UTC (rev 13012)
@@ -1,19 +1,23 @@
-Source: r-cran-rcurl
+Source: rcurl
Section: gnu-r
Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Steffen Moeller <moeller at debian.org>,
-Build-Depends: debhelper (>= 8), cdbs, r-base-dev (>= 2.14.2~20120222),
+ Ivo Maintz <ivo at maintz.de>
+Build-Depends: debhelper (>= 9.0.0), autotools-dev,
+ r-base-dev,
r-cran-bitops,
- libcurl4-openssl-dev
-Standards-Version: 3.9.3
+ libcurl4-gnutls-dev | libcurl4-openssl-dev,
+ cdbs,
+ dpkg-dev (>= 1.16.1~)
+Standards-Version: 3.9.4
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/R/r-cran-rcurl/trunk/
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/R/r-cran-rcurl/trunk/
-Homepage: http://cran.r-project.org/web/packages/RCurl
+Homepage: http://www.omegahat.org/RCurl/
Package: r-cran-rcurl
Architecture: any
-Depends: ${shlibs:Depends}, ${R:Depends}
+Depends: ${shlibs:Depends}, ${R-Depends}, ${misc:Depends}
Suggests: r-cran-xml,r-cran-rcompression
Provides: r-omegahat-rcurl, r-bioc-rcurl
Description: GNU R package for network access
Modified: trunk/packages/R/r-cran-rcurl/trunk/debian/copyright
===================================================================
--- trunk/packages/R/r-cran-rcurl/trunk/debian/copyright 2013-02-15 09:36:18 UTC (rev 13011)
+++ trunk/packages/R/r-cran-rcurl/trunk/debian/copyright 2013-02-15 09:44:11 UTC (rev 13012)
@@ -5,13 +5,33 @@
Files: *
Copyright: 2001-2012 Duncan Temple Lang <duncan at wald.ucdavis.edu>
-License: BSD
+License: BSD-3-Clause
Files: debian/*
Copyright: 2012 Steffen Moeller <moeller at debian.org>,
-License: BSD
+License: BSD-3-Clause
-License: BSD
- On a Debian system, the GNU GPL license is distributed in the file
- ‘/usr/share/common-licenses/BSD’.
-
+License: BSD-3-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT.
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR.
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE HOLDERS OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,.
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,.
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR.
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF.
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING.
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS.
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Added: trunk/packages/R/r-cran-rcurl/trunk/debian/docs
===================================================================
--- trunk/packages/R/r-cran-rcurl/trunk/debian/docs (rev 0)
+++ trunk/packages/R/r-cran-rcurl/trunk/debian/docs 2013-02-15 09:44:11 UTC (rev 13012)
@@ -0,0 +1,4 @@
+FAQ.html
+README
+Todo.html
+inst/examples
Added: trunk/packages/R/r-cran-rcurl/trunk/debian/patches/hardening
===================================================================
--- trunk/packages/R/r-cran-rcurl/trunk/debian/patches/hardening (rev 0)
+++ trunk/packages/R/r-cran-rcurl/trunk/debian/patches/hardening 2013-02-15 09:44:11 UTC (rev 13012)
@@ -0,0 +1,40 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ rcurl (1.95.3-1) unstable; urgency=low
+ .
+ * Initial release
+Author: Ivo Maintz <ivo at maintz.de>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: r-cran-rcurl-1.95.3/src/Makevars.in
+===================================================================
+--- r-cran-rcurl-1.95.3.orig/src/Makevars.in 2013-02-15 10:04:01.300884826 +0100
++++ r-cran-rcurl-1.95.3/src/Makevars.in 2013-02-15 10:25:29.920867562 +0100
+@@ -10,8 +10,8 @@
+ # -DRCURL_DEBUG_MEMORY
+ DEFINES=@DEFINES@
+
+-PKG_CPPFLAGS=$(CURL_CFLAGS) $(DEFINES) $(shell xml2-config --cflags)
+-PKG_LIBS=$(CURL_LIBS) $(shell xml2-config --libs)
++PKG_CPPFLAGS=$(CURL_CFLAGS) $(DEFINES) $(shell xml2-config --cflags) $(shell dpkg-buildflags --get CPPFLAGS)
++PKG_LIBS=$(CURL_LIBS) $(shell xml2-config --libs) -Wl,-z,relro
+
+ # enums.o: enums.c CurlOptEnums.h
+
Added: trunk/packages/R/r-cran-rcurl/trunk/debian/patches/series
===================================================================
--- trunk/packages/R/r-cran-rcurl/trunk/debian/patches/series (rev 0)
+++ trunk/packages/R/r-cran-rcurl/trunk/debian/patches/series 2013-02-15 09:44:11 UTC (rev 13012)
@@ -0,0 +1 @@
+hardening
Modified: trunk/packages/R/r-cran-rcurl/trunk/debian/rules
===================================================================
--- trunk/packages/R/r-cran-rcurl/trunk/debian/rules 2013-02-15 09:36:18 UTC (rev 13011)
+++ trunk/packages/R/r-cran-rcurl/trunk/debian/rules 2013-02-15 09:44:11 UTC (rev 13012)
@@ -1,3 +1,15 @@
#!/usr/bin/make -f
+# -*- makefile -*-
include /usr/share/R/debian/r-cran.mk
+
+install/$(package)::
+ rm -rf debian/$(package)/usr/lib/R/site-library/RCurl/examples
+ dh_installchangelogs -k Changes.html
+
+clean::
+ rm -f src/Makevars
+ dh_clean
+
+get-orig-source::
+ uscan --force-download --repack --verbose
Added: trunk/packages/R/r-cran-rcurl/trunk/debian/upstream
===================================================================
--- trunk/packages/R/r-cran-rcurl/trunk/debian/upstream (rev 0)
+++ trunk/packages/R/r-cran-rcurl/trunk/debian/upstream 2013-02-15 09:44:11 UTC (rev 13012)
@@ -0,0 +1,8 @@
+Archive: CRAN
+Contact: Duncan Temple Lang <duncan at r-project.org>
+Download: http://cran.r-project.org/src/contrib/
+Homepage: http://cran.r-project.org/web/packages/RCurl/
+Name: RCurl
+Watch: |
+ version=3
+ http://cran.r-project.org/src/contrib/rcurl-([\d.-]*)\.tar.gz
Modified: trunk/packages/R/r-cran-rcurl/trunk/debian/watch
===================================================================
--- trunk/packages/R/r-cran-rcurl/trunk/debian/watch 2013-02-15 09:36:18 UTC (rev 13011)
+++ trunk/packages/R/r-cran-rcurl/trunk/debian/watch 2013-02-15 09:44:11 UTC (rev 13012)
@@ -1,3 +1,3 @@
version=3
-http://cran.r-project.org/src/contrib/RCurl_([-0-9\.]*).tar.gz
-
+opts="uversionmangle=s/-/./" \
+http://cran.r-project.org/src/contrib/RCurl_([\d.-]*)\.tar.gz
More information about the debian-med-commit
mailing list