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

[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.2_rc1-1-259-gc6ddb3f



The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 360303ad7fc2062505492e0c9559f7fd37736dd5
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Mon Mar 25 20:25:54 2013 +0100

    VER is dead and gone

diff --git a/rules b/rules
index 8a0b451..379b70c 100755
--- a/rules
+++ b/rules
@@ -1548,9 +1548,9 @@ endif
 	# but better than manual bookkeeping
 	perl -pi -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v ia64|sed -e 's/\[[^]]*\]//g'))#g" debian/control
 ifeq "$(BUILD_KDE)" "y"
-	perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice$(VER)-gnome | libreoffice$(VER)-kde/' debian/control
+	perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome | libreoffice-kde/' debian/control
 else
-	perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice$(VER)-gnome/' debian/control
+	perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome/' debian/control
 endif
 
 ifeq (sk,$(findstring sk,$(HELPISOS)))

-- 
LibreOffice packaging repository


Reply to: