From a1f58fa05712c43b6a41ef47fab22b7469345fbb Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Mon, 11 Nov 2013 10:53:27 +0100 Subject: [PATCH] ubuntu packaging changes --- packaging/debian/buildppa.sh | 105 ++++++++++++++---- packaging/debian/debian/changelog | 6 +- .../unity-scope-recoll/debian/changelog | 2 +- src/desktop/unity-scope-recoll/mkdist.sh | 2 +- src/makesrcdist.sh | 2 - 5 files changed, 90 insertions(+), 27 deletions(-) diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh index 5f7a8ec5..f6808641 100644 --- a/packaging/debian/buildppa.sh +++ b/packaging/debian/buildppa.sh @@ -4,26 +4,59 @@ # For the kio: (and kdesdk?) # sudo apt-get install pkg-kde-tools cdbs -RCLVERS=1.19.5 -LENSVERS=1.19.2.3328 -PPAVERS=3 +RCLVERS=1.20.0 +LENSVERS=1.20.0.3519 +SCOPEVERS=1.20.0.3519 +PPAVERS=2 case $RCLVERS in [23]*) PPANAME=recollexp-ppa;; 1.14*) PPANAME=recoll-ppa;; *) PPANAME=recoll15-ppa;; esac -#PPANAME=recollexp-ppa +PPANAME=recollexp-ppa echo "PPA: $PPANAME. Type CR if Ok, else ^C" read rep ####### QT4 debdir=debianrclqt4 -series4="lucid oneiric precise quantal raring saucy" -series4="quantal raring" +series="lucid oneiric precise" +series="" +if test X$series != X ; then + test -d recoll-${RCLVERS} || tar xvzf recoll_${RCLVERS}.orig.tar.gz +fi + +for series in $series ; do + rm -rf recoll-${RCLVERS}/debian + cp -rp ${debdir}/ recoll-${RCLVERS}/debian || exit 1 + + if test -f $debdir/control-$series ; then + cp -f -p $debdir/control-$series recoll-${RCLVERS}/debian/control + else + cp -f -p $debdir/control recoll-${RCLVERS}/debian/control + fi + + sed -e s/SERIES/${series}/g \ + -e s/PPAVERS/${PPAVERS}/g \ + < ${debdir}/changelog > recoll-${RCLVERS}/debian/changelog + + (cd recoll-${RCLVERS};debuild -S -sa) || break + + dput $PPANAME recoll_${RCLVERS}-1~ppa${PPAVERS}~${series}1_source.changes +done + +####### QT4 separate python packages +debdir=debian +series="quantal raring saucy" +series="" + +if test X$series != X ; then + test -d recoll-${RCLVERS} || tar xvzf recoll_${RCLVERS}.orig.tar.gz +fi + +for series in $series ; do -for series in $series4 ; do rm -rf recoll-${RCLVERS}/debian cp -rp ${debdir}/ recoll-${RCLVERS}/debian || exit 1 @@ -43,17 +76,19 @@ for series in $series4 ; do done ### KIO -seriesk="lucid oneiric precise quantal raring" -seriesk= +series="lucid oneiric precise quantal raring" +series= debdir=debiankio topdir=kio-recoll-${RCLVERS} -test -d kio-recoll_${RCLVERS}.orig.tar.gz || \ - cp -p recoll_${RCLVERS}.orig.tar.gz kio-recoll_${RCLVERS}.orig.tar.gz || \ - exit 1 -test -d $topdir || cp -rp recoll-${RCLVERS} $topdir - -for series in $seriesk ; do +if test X$series != X ; then + test -d kio-recoll_${RCLVERS}.orig.tar.gz || \ + cp -p recoll_${RCLVERS}.orig.tar.gz \ + kio-recoll_${RCLVERS}.orig.tar.gz || \ + exit 1 + test -d $topdir || tar xvzf recoll_${RCLVERS}.orig.tar.gz +fi +for series in $series ; do rm -rf $topdir/debian cp -rp ${debdir}/ $topdir/debian || exit 1 @@ -69,12 +104,16 @@ for series in $seriesk ; do done ### Unity Lens -seriesl="oneiric precise quantal raring" -seriesl= +series="oneiric precise quantal raring" +series= + debdir=debianunitylens topdir=recoll-lens-${LENSVERS} - -for series in $seriesl ; do +if test X$series != X ; then + test -d $topdir || tar xvzf recoll-lens_${LENSVERS}.orig.tar.gz +fi +test -d $topdir || +for series in $series ; do rm -rf $topdir/debian cp -rp ${debdir}/ $topdir/debian || exit 1 @@ -85,6 +124,32 @@ for series in $seriesl ; do (cd $topdir;debuild -S -sa) || break - dput $PPANAME recoll-lens_${LENSVERS}-1~ppa${PPAVERS}~${series}1_source.changes + dput $PPANAME \ + recoll-lens_${LENSVERS}-1~ppa${PPAVERS}~${series}1_source.changes + +done + +### Unity Scope +series="saucy" +#series= + +debdir=debianunityscope +topdir=unity-scope-recoll-${SCOPEVERS} +if test X$series != X ; then + test -d $topdir || tar xvzf unity-scope-recoll_${LENSVERS}.orig.tar.gz +fi +for series in $series ; do + + rm -rf $topdir/debian + cp -rp ${debdir}/ $topdir/debian || exit 1 + + sed -e s/SERIES/$series/g \ + -e s/PPAVERS/${PPAVERS}/g \ + < ${debdir}/changelog > $topdir/debian/changelog ; + + (cd $topdir;debuild -S -sa) || break + + dput $PPANAME \ + unity-scope-recoll_${SCOPEVERS}-1~ppa${PPAVERS}~${series}1_source.changes done diff --git a/packaging/debian/debian/changelog b/packaging/debian/debian/changelog index 17c1f1e4..1c8ed949 100644 --- a/packaging/debian/debian/changelog +++ b/packaging/debian/debian/changelog @@ -1,8 +1,8 @@ -recoll (1.20.0-1.1) raring; urgency=low +recoll (1.20.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low - * local package testing new release build + * Separate python packages and "smart" scope - -- Jean-Francois Dockes Sun, 30 Dec 2012 12:29:46 +0530 + -- Jean-Francois Dockes Mon, 11 Nov 2013 11:01:46 +0100 recoll (1.18.1-1) experimental; urgency=low diff --git a/src/desktop/unity-scope-recoll/debian/changelog b/src/desktop/unity-scope-recoll/debian/changelog index ddf22a41..1519466b 100644 --- a/src/desktop/unity-scope-recoll/debian/changelog +++ b/src/desktop/unity-scope-recoll/debian/changelog @@ -1,4 +1,4 @@ -unity-scope-recoll (1.20.0.3506) saucy; urgency=low +unity-scope-recoll (1.20.0.3519-1~ppaPPAVERS~SERIES1) SERIES; urgency=low * Initial port of the recoll lens to the new Dash -- Jean-Francois Dockes Wed, 06 Nov 2013 15:23:00 +0200 diff --git a/src/desktop/unity-scope-recoll/mkdist.sh b/src/desktop/unity-scope-recoll/mkdist.sh index 227101c7..9d8c7f15 100644 --- a/src/desktop/unity-scope-recoll/mkdist.sh +++ b/src/desktop/unity-scope-recoll/mkdist.sh @@ -27,7 +27,7 @@ if test "$checkmodified" = "yes" -a ! -z "$editedfiles"; then fatal "Edited files exist: " $editedfiles fi -releasename=recoll-scope-${VERSION} +releasename=unity-scope-recoll-${VERSION} topdir=$targetdir/$releasename if test ! -d $topdir ; then diff --git a/src/makesrcdist.sh b/src/makesrcdist.sh index 086a9bad..8efd8e67 100644 --- a/src/makesrcdist.sh +++ b/src/makesrcdist.sh @@ -155,11 +155,9 @@ out=$releasename.tar.gz echo "$targetdir/$out created" # Check manifest against current reference -( export LANG=C tar tzf $targetdir/$out | sort | cut -d / -f 2- | \ diff mk/manifest.txt - || fatal "Please fix file list mk/manifest.txt" -) # We tag .. as there is the 'packaging/' directory in there [ $dotag = "yes" ] && tagtop $TAG