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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-1-2-g574ec52



The following commit has been merged in the debian-experimental-3.5 branch:
commit 574ec5208b2e988b3c833af28724bf7ac75832f9
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Thu Feb 16 17:29:26 2012 +0100

    debian/libreoffice-common.postrm.in: remove mismerged superfluous fi

diff --git a/changelog b/changelog
index ab2d3de..003e220 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,6 @@
 libreoffice (1:3.5.0-1) experimental; urgency=low
 
+  [ Rene Engelhard ]
   * LibreOffice 3.5.0 final release (identical to rc3)
 
   * debian/patches/no-rcX-in-final.diff: don't show rc3, it's not a rc
@@ -18,6 +19,9 @@ libreoffice (1:3.5.0-1) experimental; urgency=low
   * debian/watch: point to download.documentfoundation.org/libreoffice/src
     instead of dev-builds
 
+  [ Bjoern Michaelsen ]
+  * debian/libreoffice-common.postrm.in: remove mismerged superfluous fi
+
  -- Rene Engelhard <rene@debian.org>  Tue, 14 Feb 2012 17:56:49 +0000
 
 libreoffice (1:3.5.0~rc3-1) experimental; urgency=low
diff --git a/libreoffice-common.postrm.in b/libreoffice-common.postrm.in
index acd76df..5fc21b0 100644
--- a/libreoffice-common.postrm.in
+++ b/libreoffice-common.postrm.in
@@ -23,7 +23,6 @@ case "$1" in
 		rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g` || true
 		# and try to remove /@OOBRANDDIR@ itself
 		rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g` || true
-	fi
 	;;
 esac
 

-- 
LibreOffice packaging repository


Reply to: