Added the possibility to backport R 2.4.1 to sarge

with the backport from CRAN (2.4.0-0sarge2) installed



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

7 files changed, 148 insertions, 18 deletions

diff --git a/backport_r-base.sh b/backport_r-base.sh
deleted file mode 100644
index 3ee8187..0000000
--- a/backport_r-base.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# SVN: $Id$
-# Script to automate building backports from Dirks r-base packages to etch.
-# Depends: python-debian, edit_changelog.py
-# Author:  Johannes Ranke <jranke@uni-bremen.de>
-# Comment: Doesn't currently work, since debian_bundle.changelog from
-#          python-debian throws an error with the changelog in r-base (message
-#          to pkg-python-debian-discuss on December 16 2006)
-# Last Change: 2006 Dez 20
-
-cd r-base
-rm -rf *
-apt-get source -t unstable r-base
-cd r-base-*
-python ../../edit_changelog.py
-fakeroot dpkg-buildpackage
-cd ../..
diff --git a/backport_recommended.sh b/backport_recommended_etch.sh
index d24ebad..d24ebad 100644
--- a/backport_recommended.sh
+++ b/backport_recommended_etch.sh
diff --git a/backport_recommended_sarge.sh b/backport_recommended_sarge.sh
new file mode 100644
index 0000000..0ed5afa
--- /dev/null
+++ b/backport_recommended_sarge.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+# SVN: $Id$
+# Script to automate building backports from Dirks r-cran-* packages to etch.
+# 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: 2006 Dez 21
+
+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
+	python ../../edit_changelog_sarge.py
+	fakeroot dpkg-buildpackage
+	cd ../..
+done
diff --git a/edit_changelog.py b/edit_changelog_etch.py
index 34bf950..61cf371 100644
--- a/edit_changelog.py
+++ b/edit_changelog_etch.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# SVN: $Id$
+# SVN: $Id: edit_changelog.py 5 2006-12-20 14:08:52Z ranke $
 # Author: Johannes Ranke <jranke@uni-bremen.de>
 # Last Change: 2006 Dez 20
 
diff --git a/edit_changelog_sarge.py b/edit_changelog_sarge.py
new file mode 100644
index 0000000..56bef13
--- /dev/null
+++ b/edit_changelog_sarge.py
@@ -0,0 +1,28 @@
+#!/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: 2006 Dez 21
+
+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('');
+
+file(chlg,"w").write(str(changelog))
diff --git a/r-cran.mk.orig b/r-cran.mk.orig
new file mode 100755
index 0000000..8fca38d
--- /dev/null
+++ b/r-cran.mk.orig
@@ -0,0 +1,47 @@
+#!/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-sarge-cran-recommended.mk b/r-sarge-cran-recommended.mk
new file mode 100755
index 0000000..6cae6d9
--- /dev/null
+++ b/r-sarge-cran-recommended.mk
@@ -0,0 +1,51 @@
+#!/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: 2006 Dez 21
+
+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