From: blundellc <blundellc@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
Date: Sat, 13 Sep 2008 13:18:41 +0000 (+0000)
Subject: sysreq: never explicitly depend upon build-essentials. add some obvious sysreq overri... 
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cb468acb9104b6c36f07f06ab14651b7d55f2912;p=cran2deb.git

sysreq: never explicitly depend upon build-essentials. add some obvious sysreq overrides. allow + unescaped in SQL strings.

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

diff --git a/pkg/trunk/R/db.R b/pkg/trunk/R/db.R
index 3795a5f..a4964f2 100644
--- a/pkg/trunk/R/db.R
+++ b/pkg/trunk/R/db.R
@@ -29,7 +29,7 @@ db.stop <- function(con) {
 }
 
 db.quote <- function(text) {
-    return(paste('"',gsub('([^][[:alnum:]*?. ()<>:/=-])','\\\\\\1',text),'"',sep=''))
+    return(paste('"',gsub('([^][[:alnum:]*?. ()<>:/=+-])','\\\\\\1',text),'"',sep=''))
 }
 
 db.sysreq.override <- function(sysreq_text) {
diff --git a/pkg/trunk/R/debcontrol.R b/pkg/trunk/R/debcontrol.R
index cdbc4fb..2f2aca6 100644
--- a/pkg/trunk/R/debcontrol.R
+++ b/pkg/trunk/R/debcontrol.R
@@ -58,6 +58,7 @@ sysreqs.as.debian <- function(sysreq_text) {
         # drop version information/comments for now
         sysreq = gsub('[\\([][^])]*[]\\)]','',sysreq)
         sysreq = gsub('version','',sysreq)
+        sysreq = gsub('from','',sysreq)
         sysreq = gsub('[<>=]*[[:space:]]*[[:digit:]]+[[:digit:].+:~-]*','',sysreq)
         # byebye URLs
         sysreq = gsub('(ht|f)tps?://[[:alnum:]!?*"\'(),%$_@.&+/=-]*','',sysreq)
@@ -70,7 +71,12 @@ sysreqs.as.debian <- function(sysreq_text) {
             stop('unmet system requirement')
         }
         message(paste('N: mapped SystemRequirement',startreq,'onto',deb,'via',sysreq))
-        debs = c(debs,deb)
+        if (deb == 'build-essential') {
+            # already in any build environment so no explicit depend.
+            message(paste('N: SystemRequirement',startreq,'dropped'))
+        } else {
+            debs = c(debs,deb)
+        }
     }
     return(debs)
 }
diff --git a/pkg/trunk/data/populate_sysreq b/pkg/trunk/data/populate_sysreq
new file mode 100644
index 0000000..ef12979
--- /dev/null
+++ b/pkg/trunk/data/populate_sysreq
@@ -0,0 +1,21 @@
+add build-essential gcc
+add build-essential gnu make
+add libquantlib0-dev quantlib
+add pari-gp pari/gp
+add libcairo2-dev cairo
+add libgd2-noxpm-dev libgd
+add libatk1.0-dev atk
+add libpango1.0-dev pango
+add libgtk2.0-dev gtk+?
+add libglade2-dev *glade
+add libglib2.0-dev glib
+add libgl1-mesa-dev opengl
+add libglu1-mesa-dev glu library
+add zlib1g-dev zlib
+add libpng12-dev libpng
+add libfreetype6-dev freetype
+add libgsl0-dev gnu scientific library
+add libgmp3-dev gmp
+add libgdal1-dev gdal
+add proj proj.4
+add libgraphviz-dev graphviz