diff options
| -rwxr-xr-x | backport | 3 | ||||
| -rw-r--r-- | jessie/_reverts_r-cran-rjags.sh | 7 | ||||
| -rw-r--r-- | squeeze/_reverts_jags.sh | 3 | ||||
| -rw-r--r-- | squeeze/_reverts_r-cran-rjags.sh | 13 | ||||
| -rw-r--r-- | wheezy/_reverts_r-cran-rjags.sh | 7 |
5 files changed, 9 insertions, 24 deletions
@@ -100,11 +100,10 @@ dch -v "${cranversion}" --force-distribution -D $DIST-cran -b "Backport from Deb # Adapt build dependency on r-base-dev if present if grep -q "^Build-Depends.*r-base-dev" debian/control then - echo "Lowering Build-Depends to $rbasedev" ssed -i -R "/^Build-Depends/s/r-base-dev \(>= .*?\)/$rbasedev/" debian/control ssed -i -R "/^Build-Depends-Indep/s/r-base-dev \(>= .*?\)/$rbasedev/" debian/control - dch -a "debian/control: adapt build dependencies on r-base-dev to current backport" + dch -a "debian/control: Adapt build dependency on r-base-dev to current backport" fi # Check for a script doing modifications required for backporting diff --git a/jessie/_reverts_r-cran-rjags.sh b/jessie/_reverts_r-cran-rjags.sh index 45bf82e..e7fc882 100644 --- a/jessie/_reverts_r-cran-rjags.sh +++ b/jessie/_reverts_r-cran-rjags.sh @@ -1,3 +1,4 @@ - # 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" +# Lower dependencies for jags +ssed -i -R "/^Build-Depends/s/jags \(>= .*?\)/jags (>= 4.0)/" debian/control +ssed -i -R "/^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/squeeze/_reverts_jags.sh b/squeeze/_reverts_jags.sh deleted file mode 100644 index 97a5bd1..0000000 --- a/squeeze/_reverts_jags.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_r-cran-rjags.sh b/squeeze/_reverts_r-cran-rjags.sh deleted file mode 100644 index 878b5ec..0000000 --- a/squeeze/_reverts_r-cran-rjags.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_r-cran-rjags.sh b/wheezy/_reverts_r-cran-rjags.sh index 45bf82e..e7fc882 100644 --- a/wheezy/_reverts_r-cran-rjags.sh +++ b/wheezy/_reverts_r-cran-rjags.sh @@ -1,3 +1,4 @@ - # 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" +# Lower dependencies for jags +ssed -i -R "/^Build-Depends/s/jags \(>= .*?\)/jags (>= 4.0)/" debian/control +ssed -i -R "/^Depends/s/jags \(>= .*?\)/jags (>= 4.0)/" debian/control +dch -a "debian/control: Lower (build) dependency on jags to be satisfied by backport" |