From c0581150f19909dc61800a2e41eac5731a07dde3 Mon Sep 17 00:00:00 2001 From: ranke Date: Mon, 14 Dec 2015 07:28:22 +0000 Subject: Rename scripts doing backporting modifications git-svn-id: svn+ssh://stiller/home/schatz/reps/r-backports@115 f247ebf9-aa24-0410-a698-f940e971ad2b --- backport | 2 +- clean.sh | 6 +----- jessie/_reverts_jags.sh | 3 +++ jessie/jags-reverts.sh | 3 --- squeeze/_reverts_jags.sh | 3 +++ squeeze/_reverts_r-base.sh | 13 +++++++++++++ squeeze/_reverts_r-cran-rjags.sh | 13 +++++++++++++ squeeze/jags-reverts.sh | 3 --- squeeze/r-base-reverts.sh | 13 ------------- wheezy/_reverts_jags.sh | 3 +++ wheezy/_reverts_r-cran-rjags.sh | 3 +++ wheezy/jags-reverts.sh | 3 --- 12 files changed, 40 insertions(+), 28 deletions(-) create mode 100644 jessie/_reverts_jags.sh delete mode 100644 jessie/jags-reverts.sh create mode 100644 squeeze/_reverts_jags.sh create mode 100644 squeeze/_reverts_r-base.sh create mode 100644 squeeze/_reverts_r-cran-rjags.sh delete mode 100644 squeeze/jags-reverts.sh delete mode 100644 squeeze/r-base-reverts.sh create mode 100644 wheezy/_reverts_jags.sh create mode 100644 wheezy/_reverts_r-cran-rjags.sh delete mode 100644 wheezy/jags-reverts.sh 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 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/_reverts_jags.sh b/jessie/_reverts_jags.sh new file mode 100644 index 0000000..97a5bd1 --- /dev/null +++ b/jessie/_reverts_jags.sh @@ -0,0 +1,3 @@ +ssed -i -R "/^Build-Depends/s/gfortran \(.*\)/gfortran/" debian/control +ssed -i -R "/^Build-Depends/s/g++ \(.*\)/g++/" debian/control +dch -a "debian/control: remove version requirements for gfortran and g++" diff --git a/jessie/jags-reverts.sh b/jessie/jags-reverts.sh deleted file mode 100644 index 97a5bd1..0000000 --- a/jessie/jags-reverts.sh +++ /dev/null @@ -1,3 +0,0 @@ -ssed -i -R "/^Build-Depends/s/gfortran \(.*\)/gfortran/" debian/control -ssed -i -R "/^Build-Depends/s/g++ \(.*\)/g++/" debian/control -dch -a "debian/control: remove version requirements for gfortran and g++" diff --git a/squeeze/_reverts_jags.sh b/squeeze/_reverts_jags.sh new file mode 100644 index 0000000..97a5bd1 --- /dev/null +++ b/squeeze/_reverts_jags.sh @@ -0,0 +1,3 @@ +ssed -i -R "/^Build-Depends/s/gfortran \(.*\)/gfortran/" debian/control +ssed -i -R "/^Build-Depends/s/g++ \(.*\)/g++/" debian/control +dch -a "debian/control: remove version requirements for gfortran and g++" diff --git a/squeeze/_reverts_r-base.sh b/squeeze/_reverts_r-base.sh new file mode 100644 index 0000000..878b5ec --- /dev/null +++ b/squeeze/_reverts_r-base.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/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/squeeze/jags-reverts.sh b/squeeze/jags-reverts.sh deleted file mode 100644 index 97a5bd1..0000000 --- a/squeeze/jags-reverts.sh +++ /dev/null @@ -1,3 +0,0 @@ -ssed -i -R "/^Build-Depends/s/gfortran \(.*\)/gfortran/" debian/control -ssed -i -R "/^Build-Depends/s/g++ \(.*\)/g++/" debian/control -dch -a "debian/control: remove version requirements for gfortran and g++" diff --git a/squeeze/r-base-reverts.sh b/squeeze/r-base-reverts.sh deleted file mode 100644 index 878b5ec..0000000 --- a/squeeze/r-base-reverts.sh +++ /dev/null @@ -1,13 +0,0 @@ - # 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/_reverts_jags.sh b/wheezy/_reverts_jags.sh new file mode 100644 index 0000000..97a5bd1 --- /dev/null +++ b/wheezy/_reverts_jags.sh @@ -0,0 +1,3 @@ +ssed -i -R "/^Build-Depends/s/gfortran \(.*\)/gfortran/" debian/control +ssed -i -R "/^Build-Depends/s/g++ \(.*\)/g++/" debian/control +dch -a "debian/control: remove version requirements for gfortran and g++" 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" diff --git a/wheezy/jags-reverts.sh b/wheezy/jags-reverts.sh deleted file mode 100644 index 97a5bd1..0000000 --- a/wheezy/jags-reverts.sh +++ /dev/null @@ -1,3 +0,0 @@ -ssed -i -R "/^Build-Depends/s/gfortran \(.*\)/gfortran/" debian/control -ssed -i -R "/^Build-Depends/s/g++ \(.*\)/g++/" debian/control -dch -a "debian/control: remove version requirements for gfortran and g++" -- cgit v1.2.1