Some changes for making the hopefully final etch backport for 2.4.1

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

3 files changed, 11 insertions, 7 deletions

diff --git a/backport_recommended_etch.sh b/backport_recommended_etch.sh
index 4e9a53a..cdf39fb 100644
--- a/backport_recommended_etch.sh
+++ b/backport_recommended_etch.sh
@@ -3,15 +3,17 @@
 # Script to automate building backports from Dirks r-cran-* packages to etch.
 # Depends: python-debian, edit_changelog.py
 # Author:  Johannes Ranke <jranke@uni-bremen.de>
-# Comment: First, a backport of R should be installed
-# Last Change: 2006 Dec 22
+# Comment: First, r-base should be backported and installed
+# Last Change: 2007 Jan 03
 
 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-*
-	python ../../edit_changelog.py
+	cp ../../r-etch-cran-recommended.mk debian/rules
+	sed -i 's/^Replaces:.*/&, r-recommended (= 2.4.0-0sarge2)/' debian/control
+	python ../../edit_changelog_etch.py
 	fakeroot dpkg-buildpackage
 	cd ../..
 done
diff --git a/backport_recommended_sarge.sh b/backport_recommended_sarge.sh
index 5cb52af..ea18749 100644
--- a/backport_recommended_sarge.sh
+++ b/backport_recommended_sarge.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 # SVN: $Id$
-# Script to automate building backports from Dirks r-cran-* packages to etch.
+# 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: 2006 Dez 21
+# Last Change: 2007 Jan 03
 
 for i in boot cluster foreign kernsmooth lattice mgcv nlme rpart survival vr; do
 	cd $i
diff --git a/edit_changelog_etch.py b/edit_changelog_etch.py
index 61cf371..4c17e2a 100644
--- a/edit_changelog_etch.py
+++ b/edit_changelog_etch.py
@@ -1,7 +1,7 @@
 #!/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 20
+# Last Change: 2007 Jan 03
 
 from time import strftime
 from debian_bundle.changelog import Changelog, Version
@@ -11,7 +11,7 @@ author = 'Johannes Ranke <jranke@uni-bremen.de>'
 chlg = "debian/changelog"
 content = file(chlg).read()
 changelog = Changelog(content)
-newVersion = changelog.upstream_version()  + "-" + changelog.debian_version()  + "~cran.1"
+newVersion = changelog.upstream_version()  + "-" + changelog.debian_version()  + "~etchcran.1"
 
 changelog.new_block(package=changelog.package(),
                     version=Version(newVersion),
@@ -23,6 +23,8 @@ changelog.new_block(package=changelog.package(),
 
 changelog.add_change('');
 changelog.add_change('  * Backport to etch 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('');
 
 file(chlg,"w").write(str(changelog))