Rename scripts doing backporting modifications

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

8 files changed, 18 insertions, 6 deletions

diff --git a/backport b/backport
index 4761ee2..7cbbee0 100755
--- a/backport
+++ b/backport
@@ -108,7 +108,7 @@ then
 fi
 
 # Check for a script doing modifications required for backporting
-script=../$pkg-reverts.sh
+script=../\_reverts\_$pkg\.sh
 
 if [ -f $script ]; then source $script; fi
 
diff --git a/clean.sh b/clean.sh
index 3bdef59..4a3099d 100644
--- a/clean.sh
+++ b/clean.sh
@@ -1,12 +1,8 @@
 # Author: Johannes Ranke <jranke@uni-bremen.de>
 
 for i in boot cluster codetools foreign kernsmooth lattice mgcv nlme r-cran-class r-cran-coda r-cran-mass r-cran-nnet r-cran-spatial rmatrix rodbc rpart survival littler rpy rpy2 rkward jags r-cran-rjags texinfo; do
-    rm -rf $i-* # build directories leftover from backporting
-    rm $i*.dsc # source package descriptions from Debian unstable
-    rm $i*.diff.gz # source package diffs from Debian unstable
+    rm -rf $i*
 done
 rm -rf r-base*
 rm -rf tcl*
 rm -rf tk*
-rm -f *.build
-rm -f *.changes
diff --git a/jessie/jags-reverts.sh b/jessie/_reverts_jags.sh
index 97a5bd1..97a5bd1 100644
--- a/jessie/jags-reverts.sh
+++ b/jessie/_reverts_jags.sh
diff --git a/squeeze/jags-reverts.sh b/squeeze/_reverts_jags.sh
index 97a5bd1..97a5bd1 100644
--- a/squeeze/jags-reverts.sh
+++ b/squeeze/_reverts_jags.sh
diff --git a/squeeze/r-base-reverts.sh b/squeeze/_reverts_r-base.sh
index 878b5ec..878b5ec 100644
--- a/squeeze/r-base-reverts.sh
+++ b/squeeze/_reverts_r-base.sh
diff --git a/squeeze/_reverts_r-cran-rjags.sh b/squeeze/_reverts_r-cran-rjags.sh
new file mode 100644
index 0000000..878b5ec
--- /dev/null
+++ b/squeeze/_reverts_r-cran-rjags.sh
@@ -0,0 +1,13 @@
+    # 1. Starting with Debian packages for R 2.15.3 there is a build
+    # dependency on 'libtiff5-dev' which is not in squeeze. Changing to
+    # libtiff-dev, which is libtiff4-dev on squeeze.
+
+    sed -i '/^Build-Depends/s/libtiff5-dev/libtiff-dev/' debian/control
+    dch -a "debian/control: Change Build-Depends: from libtiff5-dev to libtiff-dev"
+
+    # 2. Lower build dependencies for tcl 8.6 and tk 8.6 
+    # which are not available in squeeze
+    sed -i '/^Build-Depends/s/tcl8.6-dev/tcl8.5-dev/' debian/control
+    sed -i '/^Build-Depends/s/tk8.6-dev/tk8.5-dev/' debian/control
+    dch -a "debian/control: Change Build-Depends: from tcl8.6-dev to tcl8.5-dev"
+    dch -a "debian/control: Change Build-Depends: from tk8.6-dev to tk8.5-dev"
diff --git a/wheezy/jags-reverts.sh b/wheezy/_reverts_jags.sh
index 97a5bd1..97a5bd1 100644
--- a/wheezy/jags-reverts.sh
+++ b/wheezy/_reverts_jags.sh
diff --git a/wheezy/_reverts_r-cran-rjags.sh b/wheezy/_reverts_r-cran-rjags.sh
new file mode 100644
index 0000000..45bf82e
--- /dev/null
+++ b/wheezy/_reverts_r-cran-rjags.sh
@@ -0,0 +1,3 @@
+    # Lower build dependency for jags 
+    ssed -i -R "/^Build-Depends/s/jags \(>= .*?\)/jags (>= 4.0)/" debian/control
+    dch -a "debian/control: Lower build dependency on jags to be satisfied by backport"