some extra licenses

[cran2deb.git] / pkg / trunk / R / debianpkg.R

diff --git a/pkg/trunk/R/debianpkg.R b/pkg/trunk/R/debianpkg.R
index a4f8d04eec33fc376dd67ed33f55ad8ee18f5cbd..416a9117978dffeddf91553c54bb3c581209bba3 100644 (file)
--- a/pkg/trunk/R/debianpkg.R
+++ b/pkg/trunk/R/debianpkg.R
@@ -41,6 +41,24 @@ generate_rules <- function(pkg) {
 
 generate_copyright <- function(pkg) {
     # generate_copyright file; we trust DESCRIPTION
+
+    # if maintainer is missing then try to use author
+    if (!('Maintainer' %in% colnames(pkg$description))) {
+        if ('Author' %in% colnames(pkg$description)) {
+            maintainer = pkg$description[1,'Author']
+        } else {
+            fail('Maintainer and Author not defined in R DESCRIPTION')
+        }
+    } else {
+        maintainer = pkg$description[1,'Maintainer']
+    }
+    # likewise if author is missing then try to use maintainer
+    if (!('Author' %in% colnames(pkg$description))) {
+        author = maintainer
+    } else {
+        author = pkg$description[1,'Author']
+    }
+
     writeLines(strwrap(
         paste('This Debian package of the GNU R package',pkg$name
              ,'was generated automatically using cran2deb by'
@@ -49,11 +67,11 @@ generate_copyright <- function(pkg) {
              ,'The original GNU R package is Copyright (C) '
              # TODO: copyright start date, true copyright date
              ,format(Sys.time(),'%Y')
-             ,pkg$description[1,'Author']
+             ,author
              ,'and possibly others.'
              ,''
              ,'The original GNU R package is maintained by'
-             ,pkg$description[1,'Maintainer'],'and was obtained from:'
+             ,maintainer,'and was obtained from:'
              ,''
              ,pkg$repoURL
              ,''
@@ -75,47 +93,7 @@ generate_copyright <- function(pkg) {
 
 prepare_new_debian <- function(pkg,extra_deps) {
     # generate Debian version and name
-    pkg$date_stamp = format(Sys.time(),'%a, %d %b %Y %H:%M:%S %z')
-    pkg$repo = repourl_as_debian(pkg$repoURL)
-    if (pkg$version != available[pkg$name,'Version']) {
-        # should never happen since available is the basis upon which the
-        # package is retrieved.
-        error('available version:',available[pkg$name,'Version'])
-        error('package version:',pkg$version)
-        fail('inconsistency between R package version and cached R version')
-    }
     pkg$debversion = new_build_version(pkg$name)
-    if (!length(grep('^[A-Za-z0-9][A-Za-z0-9+.-]+$',pkg$name))) {
-        fail('Cannot convert package name into a Debian name',pkg$name)
-    }
-    pkg$srcname = tolower(pkg$name)
-    pkg$debname = pkgname_as_debian(pkg$name,repo=pkg$repo)
-
-    if (!length(grep('\\.tar\\.gz',pkg$archive))) {
-        fail('archive is not tarball')
-    }
-
-    # re-pack into a Debian-named archive with a Debian-named directory.
-    debpath = file.path(dirname(pkg$archive)
-                   ,paste(pkg$srcname,'-'
-                         ,pkg$version
-                         ,sep=''))
-    file.rename(pkg$path, debpath)
-    pkg$path = debpath
-    debarchive = file.path(dirname(pkg$archive)
-                          ,paste(pkg$srcname,'_'
-                                ,pkg$version,'.orig.tar.gz'
-                                ,sep=''))
-    wd <- getwd()
-    setwd(dirname(pkg$path))
-    # remove them pesky +x files
-    log_system('find',shQuote(basename(pkg$path))
-                ,'-type f -exec chmod -x {} \\;')
-    # tar it all back up
-    log_system('tar -czf',shQuote(debarchive),shQuote(basename(pkg$path)))
-    setwd(wd)
-    file.remove(pkg$archive)
-    pkg$archive = debarchive
 
     # make the debian/ directory
     debdir <- file.path(pkg$path,'debian')
@@ -154,13 +132,11 @@ prepare_new_debian <- function(pkg,extra_deps) {
     generate_copyright(pkg)
     generate_control(pkg)
 
-    # TODO: debian/watch from pkg$repoURL
-
     # convert text to utf8 (who knows what the original character set is --
     # let's hope iconv DTRT).
     for (file in c('control','changelog','copyright')) {
         log_system('iconv -o ',shQuote(pkg$debfile(file))
-                    ,' -t utf8 '
+                    ,' -t utf8 -c '
                     ,shQuote(pkg$debfile(paste(file,'in',sep='.'))))
         file.remove(pkg$debfile(paste(file,'in',sep='.')))
     }