[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_beta2-1-10-g10be1b1



The following commit has been merged in the debian-experimental-3.5 branch:
commit 57f55a5456c8c804fc3bea9e3bad2429b84a1eac
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Dec 29 17:49:55 2011 +0000

    fix merge error

diff --git a/rules b/rules
index a070660..41abd46 100755
--- a/rules
+++ b/rules
@@ -2232,7 +2232,6 @@ ifeq "$(ENABLE_JAVA)" "y"
 	mkdir -p $(PKGDIR)-gcj/usr/share/gcj/classmap.d
 	cp -p debian/tmp/native-jars/tmp.db \
 		$(PKGDIR)-gcj/usr/share/gcj/classmap.d/libreoffice.db
-    endif
   endif
 endif
 

-- 
LibreOffice packaging repository


Reply to: