fix debian packaging to deal with webkit dep

packaging/debian/buildppa.sh

@@ -8,52 +8,37 @@ RCLVERS=1.17.0
 PPAVERS=1
 
 case $RCLVERS in
+    [23]*) PPANAME=recollexp-ppa;;
     1.14*) PPANAME=recoll-ppa;;
     *)     PPANAME=recoll15-ppa;;
 esac
 
-########## QT3
-series3=""
-case $RCLVERS in
-    1.14*)
-        series3="dapper hardy";;
-esac
-        
-if test X$series3 != X; then
-  debdir=debianrclqt3
-
-  rm -rf recoll-${RCLVERS}/debian
-  cp -rp $debdir recoll-${RCLVERS}/debian
-  for series in  $series3;do 
-    sed -e s/SERIES/$series/g < ${debdir}/changelog > \
-        recoll-${RCLVERS}/debian/changelog ;
-    (cd recoll-${RCLVERS};debuild -S -sa) || break
-    dput $PPANAME recoll_${RCLVERS}-0~ppa${PPAVERS}~${series}1_source.changes
-  done
-fi
-
 ####### QT4
-series4=""
-case $RCLVERS in
-    1.14*)
-        series4="jaunty karmic lucid maverick natty oneiric";;
-    *)
-        series4="jaunty karmic lucid maverick natty oneiric";;
-esac
-
 debdir=debianrclqt4
+series4="lucid maverick natty oneiric precise"
+
 rm -rf recoll-${RCLVERS}/debian
 cp -rp $debdir recoll-${RCLVERS}/debian
+
 for series in $series4 ; do
-  sed -e s/SERIES/$series/g < ${debdir}/changelog > \
-    recoll-${RCLVERS}/debian/changelog ;
+  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}-0~ppa${PPAVERS}~${series}1_source.changes
 done
 
 ### KIO
+seriesk="lucid maverick natty oneiric precise"
 seriesk=""
-seriesk="jaunty karmic lucid maverick natty oneiric"
 
 debdir=debiankio
 rm -rf recoll-${RCLVERS}/debian

packaging/debian/debianrclqt4/changelog

@@ -1,4 +1,4 @@
-recoll (1.17.0-0~ppa1~SERIES1) SERIES; urgency=low
+recoll (1.17.0-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
   * Updated package to recoll version 1.17.0
  -- Jean-Francois Dockes <jf@dockes.org>  Mon, 18 Mar 2012 16:50:00 +0200
 

packaging/debian/debianrclqt4/control

@@ -5,6 +5,7 @@ Maintainer: Jean-Francois Dockes <jf@dockes.org>
 Build-Depends: debhelper (>= 7), 
 	       autotools-dev,
 	       libqt4-dev,
+	       libqtwebkit-dev,
 	       libxapian-dev (>= 1.0.15),
 	       libx11-dev,
 	       libz-dev

packaging/debian/debianrclqt4/control-lucid

@@ -0,0 +1,41 @@
+Source: recoll
+Section: x11
+Priority: optional
+Maintainer: Jean-Francois Dockes <jf@dockes.org>
+Build-Depends: debhelper (>= 7), 
+	       autotools-dev,
+	       libqt4-dev,
+	       libxapian-dev (>= 1.0.15),
+	       libx11-dev,
+	       libz-dev
+Standards-Version: 3.8.3
+
+Package: recoll
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: aspell, python
+Suggests: antiword, catdoc, ghostscript, libimage-exiftool-perl, poppler-utils, unrtf, python-mutagen, xsltproc
+Description: a personal full text search package with a QT GUI
+ The Recoll personal full text search package is based on a very strong 
+ backend (Xapian), for which it provides an easy to use and feature-rich 
+ interface.
+ .
+ Features:
+    * QT-based GUI.
+    * Supports the following document types (and their compressed versions): 
+      - Natively: text, html, OpenOffice files, maildir and mailbox 
+        (Mozilla and Thunderbird mail ok) with attachments, gaim log files.
+      - With external helpers:  pdf (pdftotext), postscript (ghostscript),
+        msword (antiword), excel, ppt (catdoc), rtf (unrtf), 
+    * Powerful query facilities, with boolean searches, phrases, filter on
+      file types and directory tree. 
+    * Support for multiple charsets. Internal processing and storage uses
+      Unicode UTF-8. 
+    * Stemming performed at query time (can switch stemming language after
+      indexing) 
+    * Easy installation. No database daemon, web server or exotic language
+      necessary. 
+    * An indexer which runs either as a thread inside the GUI or as an
+      external, cron'able program. 
+ .
+  Homepage: <http://www.lesbonscomptes.com/recoll>