drop empty sysreqs

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@270 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

diff --git a/trunk/R/debcontrol.R b/trunk/R/debcontrol.R
index 915ab25b1f6fe717277dec1fde9957a51d869383..743aa0085b7707c39dda92f6139572b571cd0dd7 100644 (file)
--- a/trunk/R/debcontrol.R
+++ b/trunk/R/debcontrol.R
@@ -80,6 +80,10 @@ sysreqs_as_debian <- function(sysreq_text) {
         sysreq = gsub('(ht|f)tps?://[[:alnum:]!?*"\'(),%$_@.&+/=-]*','',sysreq)
         # squish out space
         sysreq = chomp(gsub('[[:space:]]+',' ',sysreq))
+        if (nchar(sysreq) == 0) {
+            notice('part of the SystemRequirement became nothing')
+            next
+        }
         alias <- db_sysreq_override(sysreq)
         if (is.null(alias)) {
             error('do not know what to do with SystemRequirement:',sysreq)

diff --git a/trunk/data/populate_licenses b/trunk/data/populate_licenses
index 2c27f357c36c25c2e04d4555408f35a86a584afa..7de0360825beafff6a0ea2666370ae79aaf9d870 100644 (file)
--- a/trunk/data/populate_licenses
+++ b/trunk/data/populate_licenses
@@ -1,5 +1,4 @@
 accept AGPL
-accept AGPL
 accept APACHE
 accept ARTISTIC
 accept BSD
@@ -95,19 +94,27 @@ pkg UNCLEAR titecrm
 pkg UNCLEAR tlnise
 pkg UNLIMITED boolean
 pkg acepack acepack
-pkg distrib-noncomm Bhat
-pkg distrib-noncomm PTAk
-pkg distrib-noncomm PredictiveRegression
-pkg distrib-noncomm RLadyBug
-pkg distrib-noncomm conf.design
-pkg distrib-noncomm gpclib
 pkg distrib-noncomm mlbench
-pkg distrib-noncomm poplab
-pkg distrib-noncomm siggenes
 pkg ff ff
 pkg scagnostics scagnostics
 pkg tripack tripack
 pkg BSD rtiff
 pkg MCLUST mclust02
-pkg distrib-noncomm xgobi
-pkg distrib-noncomm mapproj
+pkg distrib-noncomm CoCo
+accept GPL+AGPL
+pkg GPL+AGPL FAiR
+accept CPL
+pkg CPL Rcsdp
+accept CC-SA
+pkg CC-SA SGP
+accept ACM
+pkg ACM alphahull
+pkg ACM asypow
+accept caMassClass
+pkg caMassClass caMassClass
+pkg ARTISTIC matlab
+pkg GPL mmcm
+pkg GPL mvpart
+accept rwt
+pkg rwt rwt
+pkg UNCLEAR sgeostat