[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.1_rc1-2-11-g9cc9d89
The following commit has been merged in the debian-experimental-3.6 branch:
commit 9cc9d897597d4cbb580401bca82ff97da7595389
Author: Rene Engelhard <rene@debian.org>
Date: Wed Aug 22 21:48:57 2012 +0200
more ttf-opensymbol stuff to be removed
diff --git a/rules b/rules
index ac0f3be..ec01cf6 100755
--- a/rules
+++ b/rules
@@ -2696,7 +2696,7 @@ endif
done
for PKG in $(ARCH_INDEP_PACKAGES); do \
case $$PKG in \
- ttf-opensymbol|openoffice.org-dtd-officedocument1.0) \
+ openoffice.org-dtd-officedocument1.0) \
;; \
*) \
cat debian/changelog \
@@ -3031,7 +3031,6 @@ endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
-Nlibreoffice$(VER)-report-builder \
-Nlibreoffice$(VER)-wiki-publisher \
- -Nttf-opensymbol \
-Nfonts-opensymbol \
-Nopenoffice.org-dtd-officedocument1.0 -- \
-V'base-version=$(BASE_VERSION)' \
@@ -3047,7 +3046,7 @@ endif
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
- dh_gencontrol -pttf-opensymbol -pfonts-opensymbol -- \
+ dh_gencontrol -pfonts-opensymbol -- \
-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 | bc):$(shell fontforge -lang=ff -c 'Open($$1); Print ($$fontversion); Quit(0);' debian/fonts-opensymbol/usr/share/fonts/truetype/openoffice/opens___.ttf)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
--
LibreOffice packaging repository
Reply to: