add Author and Maintainer fields to description

[cran2deb.git] / trunk / R / debcontrol.R

diff --git a/trunk/R/debcontrol.R b/trunk/R/debcontrol.R
index 84d9933780a35d64795aa15649a9766b82bcea03..f9aeecd4c9ac791b60d9164f59fcb724c09ee30c 100644 (file)
--- a/trunk/R/debcontrol.R
+++ b/trunk/R/debcontrol.R
@@ -45,6 +45,9 @@ get_dependencies <- function(pkg,extra_deps) {
 
     # append the Debian dependencies
     depends$build=c(depends$build,'debhelper (>> 4.1.0)','cdbs')
+    if (file.exists(file.path(patch_dir, pkg$name))) {
+        depends$build <- c(depends$build,'dpatch')
+    }
     if (pkg$archdep) {
         depends$bin=c(depends$bin,'${shlibs:Depends}')
     }
@@ -77,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)
@@ -110,11 +117,11 @@ generate_control <- function(pkg) {
     # construct control file
     control = data.frame()
     control[1,'Source'] = pkg$srcname
-    control[1,'Section'] = 'math'
+    control[1,'Section'] = 'gnu-r'
     control[1,'Priority'] = 'optional'
     control[1,'Maintainer'] = maintainer
     control[1,'Build-Depends'] = paste(pkg$depends$build,collapse=', ')
-    control[1,'Standards-Version'] = '3.8.0'
+    control[1,'Standards-Version'] = '3.8.3'
 
     control[2,'Package'] = pkg$debname
     control[2,'Architecture'] = 'all'
@@ -146,7 +153,7 @@ generate_control <- function(pkg) {
         long_descr <- pkg$description[1,'Description']
     }
 
-    if (length(long_descr) < 1) {
+    if (length(long_descr) < 1 || long_descr == "") {
         # bypass lintian extended-description-is-empty for which we care not.
         long_descr <- paste('The author/maintainer of this package'
                            ,'did not care to enter a longer description.')
@@ -156,12 +163,16 @@ generate_control <- function(pkg) {
     # the longer description does not begin on the synopsis line --- R's
     # write.dcf does not appear to have a nicer way of doing this.
     descr = paste(descr,'"\n\n', long_descr, sep='')
-    if ('URL' %in% colnames(pkg$description)) {
-        descr = paste(descr,'\n\nURL: ',pkg$description[1,'URL'],sep='')
+    % add some extra nice info about the original R package
+    for (r_info in c('Author','Maintainer','URL')) {
+        if (r_info %in% colnames(pkg$description)) {
+            descr = paste(descr,'\n\n',r_info,': ',pkg$description[1,r_info],sep='')
+        }
     }
     control[2,'Description'] = descr
 
     # Debian policy says 72 char width; indent minimally
     write.dcf(control,file=pkg$debfile('control.in'),indent=1,width=72)
+    write.dcf(control,indent=1,width=72)
 }