[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-2-10-g5ff7922



The following commit has been merged in the master branch:
commit 5ff7922509aa195d19a09eef4f0d3ef2612bf548
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Jan 28 12:21:34 2012 +0100

    cleanup libreoffice-sdbc-postgresql.preinst.in to avoid dpkg warnings

diff --git a/changelog b/changelog
index f2b66d5..fe74583 100644
--- a/changelog
+++ b/changelog
@@ -6,8 +6,10 @@ libreoffice (1:3.4.5-3) UNRELEASED; urgency=low
     - enable ca-XV, put into --{l10n,help}-ca
   * ext-sources/ext-sources/3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz:
     add missing file which should have been in updated .orig-ext-sources..
+  * debian/libreoffice-sdbc-postgresql.preinst.in: cleanup to avoid dpkg
+    warnings, thanks Julian Gilbey (closes: #657530)
 
- -- Rene Engelhard <rene@debian.org>  Fri, 27 Jan 2012 21:35:33 +0000
+ -- Rene Engelhard <rene@debian.org>  Sat, 28 Jan 2012 12:20:01 +0100
 
 libreoffice (1:3.4.5-2) unstable; urgency=low
 
diff --git a/libreoffice-sdbc-postgresql.preinst.in b/libreoffice-sdbc-postgresql.preinst.in
index f276912..ccf1e2b 100755
--- a/libreoffice-sdbc-postgresql.preinst.in
+++ b/libreoffice-sdbc-postgresql.preinst.in
@@ -6,11 +6,13 @@ set -e
 
 case "$1" in
 	upgrade)
-		if dpkg --compare-versions `echo $2 | cut -d+ -f2` lt OOo3.3.0~; then
+		case `echo $2 | cut -d+ -f2`)
+		OOo*)
 			# this is a legacy package, so we need to find it first...
 			id=`/usr/lib/libreoffice/program/unopkg list --shared | grep Identifier:.*postgresql-sdbc | cut -d":" -f2`
 			remove_extension $id
-		fi
+			;;
+		esac
 	;;
 esac
 

-- 
LibreOffice packaging repository


Reply to: