ubuntu packaging: fixed partial debian merge and updated for 1.17 maintenance changes

packaging/debian/buildppa.sh

@@ -4,7 +4,7 @@
 # For the kio: (and kdesdk?)
 # sudo apt-get install pkg-kde-tools  cdbs
 
-RCLVERS=1.17.1
+RCLVERS=2696
 LENSVERS=1.17.1.2654
 PPAVERS=1
 
@@ -21,8 +21,6 @@ read rep
 ####### QT4
 debdir=debianrclqt4
 series4="lucid maverick natty oneiric precise"
-series4="natty oneiric precise"
-
 
 for series in $series4 ; do
   rm -rf recoll-${RCLVERS}/debian
@@ -66,7 +64,7 @@ done
 
 ### Unity Lens
 seriesl="natty oneiric precise"
-#seriesl="oneiric"
+seriesl=""
 
 debdir=debianunitylens
 

packaging/debian/debianrclqt4/changelog

@@ -1,3 +1,7 @@
+recoll (2696-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+  * pre-1.17.2 beta for testing thumbnail issues.
+ -- Jean-Francois Dockes <jf@dockes.org>  Mon, 14 May 2012 17:47:00 +0200
+
 recoll (1.17.1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
   * Updated package to recoll version 1.17.1: unity lens support
  -- Jean-Francois Dockes <jf@dockes.org>  Tue, 27 Mar 2012 16:21:00 +0200

packaging/debian/debianrclqt4/control

@@ -9,8 +9,7 @@ Build-Depends: debhelper (>= 7),
 	       libxapian-dev (>= 1.0.15),
 	       libx11-dev,
 	       libz-dev,
-               python-all-dev (>= 2.6.6-3~),
-               quilt
+               python-all-dev (>= 2.6.6-3~)
 Standards-Version: 3.9.3
 
 Package: recoll

packaging/debian/debianrclqt4/patches/fix-python-install.patch

@@ -10,6 +10,6 @@ Last-Update: 2012-03-26
  
  
 -@NOPYTHON@(cd python/recoll;python setup.py install \
--    --prefix=${REALPREFIX} ${ROOTFORPYTHON})
+-@NOPYTHON@ --prefix=${REALPREFIX} ${ROOTFORPYTHON})
 +#@NOPYTHON@(cd python/recoll;python setup.py install \
 +#    --prefix=${REALPREFIX} ${ROOTFORPYTHON})

packaging/debian/debianrclqt4/recoll.install

@@ -0,0 +1,12 @@
+usr/bin
+usr/lib/python*/*-packages/*.egg-info
+usr/lib/python*/*-packages/recoll.so
+usr/share/applications
+usr/share/icons
+usr/share/man
+usr/share/pixmaps
+usr/share/recoll/doc
+usr/share/recoll/examples
+usr/share/recoll/filters
+usr/share/recoll/images
+usr/share/recoll/translations

packaging/debian/debianrclqt4/rules

@@ -48,9 +48,13 @@ install:
 	dh_installdirs
 
 	$(MAKE) STRIP=ls prefix=$(CURDIR)/debian/tmp/usr install
+	# Note: the debian rules file uses --prefix instead of --root
+	# but this ends up generating an error on the ubuntu ppa:
+	#   "Found files in /usr/lib/python2.7/site-packages (must be in
+	#    dist-packages for python2.7)."
 	(cd python/recoll; python setup.py install \
 	                                   --install-layout=deb \
-	                                   --prefix=$(CURDIR)/debian/tmp/usr )
+	                                   --root=$(CURDIR)/debian/tmp )
 
 binary-arch: build install
 	dh_testdir