From 4d556972838aad56b90b96003f2ea55e824d60e6 Mon Sep 17 00:00:00 2001 From: blundellc Date: Tue, 24 Mar 2009 20:36:39 +0000 Subject: [PATCH] unstable -> testing git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@213 edb9625f-4e0d-4859-8d74-9fd3b1da38cb --- trunk/R/debianpkg.R | 2 +- trunk/inst/doc/INSTALL_NOTES | 4 ++-- trunk/inst/etc/sys/debian-amd64/mini-dinstall.conf | 2 +- trunk/inst/etc/sys/debian-amd64/pbuilderrc | 4 ++-- trunk/inst/etc/sys/debian-i386/mini-dinstall.conf | 2 +- trunk/inst/etc/sys/debian-i386/pbuilderrc | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/trunk/R/debianpkg.R b/trunk/R/debianpkg.R index d883541..621c36e 100644 --- a/trunk/R/debianpkg.R +++ b/trunk/R/debianpkg.R @@ -24,7 +24,7 @@ generate_changelog <- function(pkg) { generate_changelog_entry <- function(build, changelog) { # TODO: should say 'New upstream release' when necessary debversion <- version_new(build$r_version, build$deb_revision, build$deb_epoch) - cat(paste(paste(build$srcname,' (',debversion,') unstable; urgency=low',sep='') + cat(paste(paste(build$srcname,' (',debversion,') testing; urgency=low',sep='') ,'' ,paste(' * cran2deb ',build$scm_revision ,' with DB version ',as.integer(build$db_version),'.',sep='') ,'',paste(' --',maintainer,'',format(build$date_stamp,'%a, %d %b %Y %H:%M:%S %z')) diff --git a/trunk/inst/doc/INSTALL_NOTES b/trunk/inst/doc/INSTALL_NOTES index 47d2298..5acec95 100644 --- a/trunk/inst/doc/INSTALL_NOTES +++ b/trunk/inst/doc/INSTALL_NOTES @@ -35,10 +35,10 @@ chmod 3775 /etc/cran2deb copy ROOT/etc/* to /etc/cran2deb ln -s /var/www/cran2deb/ /etc/cran2deb/archive edit /etc/cran2deb/pbuilder.in: -OTHERMIRROR='deb http://localhost/users/cb/cran2deb/ unstable/$(ARCH)/ | deb http://localhost/users/cb/cran2deb/ unstable/all/' +OTHERMIRROR='deb http://localhost/users/cb/cran2deb/ testing/$(ARCH)/ | deb http://localhost/users/cb/cran2deb/ testing/all/' MIRRORSITE='http://ftp.debian.org/debian/' to -OTHERMIRROR='deb http://localhost/cran2deb/ unstable/$(ARCH)/ | deb http://localhost/cran2deb/ unstable/all/' +OTHERMIRROR='deb http://localhost/cran2deb/ testing/$(ARCH)/ | deb http://localhost/cran2deb/ testing/all/' MIRRORSITE='http://ftp.at.debian.org/debian/' # fix permissions for group usage. diff --git a/trunk/inst/etc/sys/debian-amd64/mini-dinstall.conf b/trunk/inst/etc/sys/debian-amd64/mini-dinstall.conf index ceadb34..20ce5a6 100644 --- a/trunk/inst/etc/sys/debian-amd64/mini-dinstall.conf +++ b/trunk/inst/etc/sys/debian-amd64/mini-dinstall.conf @@ -9,5 +9,5 @@ archivedir = /etc/cran2deb/archive/debian-amd64 logfile = /dev/null incoming_permissions=770 -[unstable] +[testing] diff --git a/trunk/inst/etc/sys/debian-amd64/pbuilderrc b/trunk/inst/etc/sys/debian-amd64/pbuilderrc index 13ead7b..6479499 100644 --- a/trunk/inst/etc/sys/debian-amd64/pbuilderrc +++ b/trunk/inst/etc/sys/debian-amd64/pbuilderrc @@ -5,8 +5,8 @@ EXTRAPACKAGES='debhelper r-base-dev cdbs r-base-core lintian xvfb xauth xfonts-b REMOVEPACKAGES='lilo libldap-2.4-2 libopencdk10 libsasl2-2' # don't actually need aptitude, but pbuilder insists... #REMOVEPACKAGES+='aptitude libcwidget3 libept0 libncursesw5 libsigc++-2.0-0c2a libxapian15' -DISTRIBUTION=unstable -OTHERMIRROR='deb http://localhost/cran2deb/debian-amd64 unstable/$(ARCH)/ | deb http://localhost/cran2deb/debian-amd64 unstable/all/ | deb http://statmath.wu-wien.ac.at/AASC/debian/ testing main' +DISTRIBUTION=testing +OTHERMIRROR='deb http://localhost/cran2deb/debian-amd64 testing/$(ARCH)/ | deb http://localhost/cran2deb/debian-amd64 testing/all/ | deb http://statmath.wu-wien.ac.at/AASC/debian/ testing main' MIRRORSITE='http://ftp.at.debian.org/debian/' APTCACHE='' PBUILDERSATISFYDEPENDSCMD='/usr/lib/pbuilder/pbuilder-satisfydepends-classic' diff --git a/trunk/inst/etc/sys/debian-i386/mini-dinstall.conf b/trunk/inst/etc/sys/debian-i386/mini-dinstall.conf index fb242d0..e7542be 100644 --- a/trunk/inst/etc/sys/debian-i386/mini-dinstall.conf +++ b/trunk/inst/etc/sys/debian-i386/mini-dinstall.conf @@ -9,5 +9,5 @@ archivedir = /etc/cran2deb/archive/debian-i386 logfile = /dev/null incoming_permissions=770 -[unstable] +[testing] diff --git a/trunk/inst/etc/sys/debian-i386/pbuilderrc b/trunk/inst/etc/sys/debian-i386/pbuilderrc index b4f43d5..e3b5f5e 100644 --- a/trunk/inst/etc/sys/debian-i386/pbuilderrc +++ b/trunk/inst/etc/sys/debian-i386/pbuilderrc @@ -5,8 +5,8 @@ EXTRAPACKAGES='debhelper r-base-dev cdbs r-base-core lintian xvfb xauth xfonts-b REMOVEPACKAGES='lilo libldap-2.4-2 libopencdk10 libsasl2-2' # don't actually need aptitude, but pbuilder insists... #REMOVEPACKAGES+='aptitude libcwidget3 libept0 libncursesw5 libsigc++-2.0-0c2a libxapian15' -DISTRIBUTION=unstable -OTHERMIRROR='deb http://localhost/cran2deb/debian-i386 unstable/$(ARCH)/ | deb http://localhost/cran2deb/debian-i386 unstable/all/ | deb http://statmath.wu-wien.ac.at/AASC/debian/ testing main' +DISTRIBUTION=testing +OTHERMIRROR='deb http://localhost/cran2deb/debian-i386 testing/$(ARCH)/ | deb http://localhost/cran2deb/debian-i386 testing/all/ | deb http://statmath.wu-wien.ac.at/AASC/debian/ testing main' MIRRORSITE='http://ftp.at.debian.org/debian/' APTCACHE='' PBUILDERSATISFYDEPENDSCMD='/usr/lib/pbuilder/pbuilder-satisfydepends-classic' -- 2.39.2