Backporting R 2.5.1

git-svn-id: svn+ssh://stiller/home/schatz/reps/r-backports@17 f247ebf9-aa24-0410-a698-f940e971ad2b

5 files changed, 2 insertions, 155 deletions

diff --git a/backport_recommended_etch.sh b/backport_recommended_etch.sh
index 2d9a047..66576bb 100644
--- a/backport_recommended_etch.sh
+++ b/backport_recommended_etch.sh
@@ -10,8 +10,8 @@
 text="Recompiled on etch for CRAN"
 
 #for i in codetools; do
-for i in rcompgen rpart survival vr; do
-#for i in boot cluster codetools foreign kernsmooth lattice mgcv nlme rcompgen rpart survival vr; do
+#for i in rcompgen rpart survival vr; do
+for i in boot cluster codetools foreign kernsmooth lattice mgcv nlme rcompgen rpart survival vr; do
 	cd $i
 	rm -rf $i*
     apt-get source -t unstable $i
diff --git a/backport_recommended_sarge.sh b/backport_recommended_sarge.sh
deleted file mode 100644
index ca1f75b..0000000
--- a/backport_recommended_sarge.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# SVN: $Id$
-# Script to automate building backports from Dirks r-cran-* packages to sarge.
-# Depends: debian_bundle, edit_changelog.py
-# Author:  Johannes Ranke <jranke@uni-bremen.de>
-# Comments: First, the backport 2.4.0-0sarge2 from CRAN should be installed
-#			debian/changelog and debian/control have to be hand-edited
-# 			for nlme and rpart, replacing their build dependency on 
-#			r-cran-survival by r-recommended (=2.4.0-0sarge2)
-# Last Change: 2007 Feb 05
-
-for i in survival; do
-#for i in boot cluster foreign kernsmooth lattice mgcv nlme rpart survival vr; do
-	cd $i
-	rm -rf $i*
-	apt-get source -t unstable r-cran-$i
-	cd $i-*
-	cp ../../r-sarge-cran-recommended.mk debian/rules
-	sed -i 's/^Replaces:.*/&, r-recommended (= 2.4.0-0sarge2)/' debian/control
-	python ../../edit_changelog_sarge.py
-	fakeroot dpkg-buildpackage -sa
-	cd ../..
-done
diff --git a/edit_changelog_sarge.py b/edit_changelog_sarge.py
deleted file mode 100644
index 3772a36..0000000
--- a/edit_changelog_sarge.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/python
-# SVN: $Id: edit_changelog.py 5 2006-12-20 14:08:52Z ranke $
-# Author: Johannes Ranke <jranke@uni-bremen.de>
-# Last Change: 2007 Feb 05
-
-from time import strftime
-from debian_bundle.changelog import Changelog, Version
-
-author = 'Johannes Ranke <jranke@uni-bremen.de>'
-
-chlg = "debian/changelog"
-content = file(chlg).read()
-changelog = Changelog(content)
-newVersion = changelog.upstream_version  + "-" + changelog.debian_version  + "~sargecran.1"
-
-changelog.new_block(package=changelog.package,
-                    version=Version(newVersion),
-                    distributions='sarge-cran',
-                    urgency='low',
-                    author=author,
-                    date=strftime("%a, %e %b %Y %H:%M:%S %z"),
-                    )
-
-changelog.add_change('');
-changelog.add_change('  * Backport to sarge for repository on CRAN');
-changelog.add_change('  * Also replaces r-recommended (= 2.4.0-0sarge2) for smooth upgrade from');
-changelog.add_change('    earlier backport by Christian Steigies');
-changelog.add_change('');
-
-f = open(chlg, 'w')
-changelog.write_to_open_file(f)
-f.close()
diff --git a/r-cran.mk.orig b/r-cran.mk.orig
deleted file mode 100755
index 8fca38d..0000000
--- a/r-cran.mk.orig
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/make -f
-# 							-*- makefile -*-
-#
-# Generic debian/rules file for the Debian/GNU Linux r-cran-* packages
-#
-# Should be sufficient for Debianization of CRAN (http://cran.r-project.org) 
-# packages. Note that you still need to provide the other files in debian/*,
-# in particular control, changelog and copyright. 
-# 
-# Copyright 2003-2006 by Dirk Eddelbuettel <edd@debian.org>
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/langcore.mk
-
-# awk command to extract word after Package or Bundle, lowercased
-awkString	:= "'/^(Package|Bundle):/ {print tolower($$2) }'"
-
-# apply it to the upstream meta-info file DESCRIPTION
-cranName        := $(shell awk "$(awkString)" DESCRIPTION)
-
-## and use the result to build the Debian'ized package name
-package		:= r-cran-$(cranName)
-
-## which we use for the to-be-installed-in directory
-debRlib		:=$(CURDIR)/debian/$(package)/usr/lib/R/site-library
-
-## optional installation of a lintian silencer
-lintiandir	:= $(CURDIR)/debian/$(package)/usr/share/lintian/overrides
-
-common-install-indep:: R_any_arch
-common-install-arch:: R_any_arch
-
-R_any_arch:
-                ## create the target directory
-		dh_installdirs		usr/lib/R/site-library
-                ## call R to install the sources we're looking at
-		R CMD INSTALL -l $(debRlib) --clean .
-                ## remove extra files which are present in some packages
-		rm -vf $(debRlib)/R.css 			\
-			$(debRlib)/$(cranName)/COPYING 		\
-			$(debRlib)/$(cranName)/LICENSE.txt
-                ## if we have an overrides file for lintian, install it
-		if test -f debian/overrides; then 		\
-			install -d $(lintiandir) ; 		\
-			install -m 0644 debian/overrides 	\
-				$(lintiandir)/$(package); 	\
-		fi
diff --git a/r-etch-cran-recommended.mk b/r-etch-cran-recommended.mk
deleted file mode 100755
index 4c4fa6c..0000000
--- a/r-etch-cran-recommended.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/make -f
-# 							-*- makefile -*-
-#
-# Generic debian/rules file for the Debian/GNU Linux r-cran-* packages
-#
-# Should be sufficient for Debianization of CRAN (http://cran.r-project.org) 
-# packages. Note that you still need to provide the other files in debian/*,
-# in particular control, changelog and copyright. 
-# 
-# Copyright 2003-2006 by Dirk Eddelbuettel <edd@debian.org>
-# Changed by: Johannes Ranke <jranke@uni-bremen.de>
-# Changed debRlib to correct value for recommended packages
-# Last Change: 2007 Jan 03
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/langcore.mk
-
-# awk command to extract word after Package or Bundle, lowercased
-awkString	:= "'/^(Package|Bundle):/ {print tolower($$2) }'"
-
-# apply it to the upstream meta-info file DESCRIPTION
-cranName        := $(shell awk "$(awkString)" DESCRIPTION)
-
-## and use the result to build the Debian'ized package name
-package		:= r-cran-$(cranName)
-
-## which we use for the to-be-installed-in directory
-## jranke: for recommended packages
-debRlib		:= $(CURDIR)/debian/$(package)/usr/lib/R/library
-
-## optional installation of a lintian silencer
-lintiandir	:= $(CURDIR)/debian/$(package)/usr/share/lintian/overrides
-
-common-install-indep:: R_any_arch
-common-install-arch:: R_any_arch
-
-R_any_arch:
-                ## create the target directory
-		dh_installdirs		usr/lib/R/site-library
-                ## call R to install the sources we're looking at
-		R CMD INSTALL -l $(debRlib) --clean .
-                ## remove extra files which are present in some packages
-		rm -vf $(debRlib)/R.css 			\
-			$(debRlib)/$(cranName)/COPYING 		\
-			$(debRlib)/$(cranName)/LICENSE.txt
-                ## if we have an overrides file for lintian, install it
-		if test -f debian/overrides; then 		\
-			install -d $(lintiandir) ; 		\
-			install -m 0644 debian/overrides 	\
-				$(lintiandir)/$(package); 	\
-		fi