./packages/openofficeorg/3.1/experimental r1436: remove openoffice-xlate-symlink again - breaks source package 1.0 building and was a bad idea from the start; uuencode/remove some more files to fix source package building
------------------------------------------------------------
revno: 1436
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Wed 2009-03-11 22:43:15 +0100
message:
remove openoffice-xlate-symlink again - breaks source package 1.0 building and was a bad idea from the start; uuencode/remove some more files to fix source package building
removed:
scripts/openoffice-xlate-lang@
modified:
rules
=== modified file 'rules'
--- a/rules 2009-03-11 17:10:06 +0000
+++ b/rules 2009-03-11 21:43:15 +0000
@@ -555,16 +555,16 @@
# but we can't/shouldn't do dynamic switching, so let en-US be the first
# one to that gid_Module_Root always is english and the other langpacks
# have gid_Module_Root.$iso
- #ISOS=$(shell debian/scripts/openoffice-xlate-lang -i all')
+ #ISOS=$(shell ooo-build/bin/openoffice-xlate-lang -i all')
ISOS:=en-US af ar as-IN be-BY bg bn br bs ca cs cy da de dz el \
en-GB en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
ka km ko ku lo lt lv mk mn ml-IN mr-IN nb ne nl nn nr ns or-IN \
pa-IN pl pt pt-BR ro ru rw sk sl sr ss st sv \
ta-IN te-IN tg th tn tr ts uk uz ve vi xh zh-CN zh-TW zu
- #HELPISOS:=$(shell debian/scripts/openoffice-xlate-lang -i all')
+ #HELPISOS:=$(shell ooo-build/bin//openoffice-xlate-lang -i all')
HELPISOS:=en-US cs da de dz en-GB es et eu fr gl hi-IN hu it ja km ko nl \
pl pt pt-BR ru sl sv zh-CN zh-TW
- #LANGPACKISOS:=$(shell debian/scripts/openoffice-xlate-lang -i all')
+ #LANGPACKISOS:=$(shell ooo-build/bin/openoffice-xlate-lang -i all')
LANGPACKISOS:=en-US af ar as-IN be-BY bg bn br bs ca cs cy da de dz el \
en-GB en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
ka km ko ku lo lt lv mk mn ml-IN mr-IN nb ne nl nn nr ns or-IN \
@@ -1079,6 +1079,7 @@
src/open*.png \
src/open{intro,about}*.bmp \
src/easter/*.png \
+ src/sg3.* \
patches/test/*.tar \
www/images/*.png \
www/l10n/*.gif
@@ -1175,6 +1176,10 @@
www/images/*.png \
www/l10n/*.gif \
doc/class_diagram.odg \
+ extensions/coooder/icons/image1_16.bmp \
+ extensions/coooder/icons/image1_16h.bmp \
+ extensions/coooder/icons/image1_26.bmp \
+ extensions/coooder/icons/image1_26h.bmp \
; do \
if [ -s $$f ]; then \
uuencode $$f $$f > $$f.uu.tmp && \
@@ -1234,8 +1239,8 @@
# Generate control file, because we have so many different languages
# Based on script by Martin Quinson <Martin.Quinson@tuxfamily.org>
control: debian/control
-debian/control: $(wildcard debian/control*in) $(shell readlink debian/scripts/openoffice-xlate-lang | sed -e 's,../../,,') debian/rules
- chmod 755 $(shell readlink debian/scripts/openoffice-xlate-lang | sed -e 's,../../,,')
+debian/control: $(wildcard debian/control*in) ooo-build/bin/openoffice-xlate-lang debian/rules
+ chmod 755 ooo-build/bin/openoffice-xlate-lang
sed -e "s#openoffice.orgVER#openoffice.org$(VER)#g" \
-e "s#broffice.orgVER#broffice.org$(VER)#g" \
-e "s#%$(DIST)=\([^%]*\)%#, \1#g#" \
@@ -1246,8 +1251,8 @@
for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \
[ "$$LNUM" = en-US -a "$(PKGSOURCE)" = "openoffice.org$(VER)-l10n" ] && continue; \
- LNAME=`debian/scripts/openoffice-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
- LCODE=`debian/scripts/openoffice-xlate-lang -i $$LNUM | tr A-Z a-z`; \
+ LNAME=`ooo-build/bin/openoffice-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
+ LCODE=`ooo-build/bin/openoffice-xlate-lang -i $$LNUM | tr A-Z a-z`; \
CCODE=`echo $$LCODE | sed 's/-.*//'`; \
case "$$LCODE" in \
bn|gu-in|pa-in|ml-in|or-in|te-in|ta-in) \
@@ -1307,8 +1312,8 @@
ifneq "$(HELPISOS)" ""
for LNUM in $(HELPISOS) ; do \
- LNAME=`debian/scripts/openoffice-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
- LCODE=`debian/scripts/openoffice-xlate-lang -i $$LNUM | tr A-Z a-z`; \
+ LNAME=`ooo-build/bin/openoffice-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
+ LCODE=`ooo-build/bin/openoffice-xlate-lang -i $$LNUM | tr A-Z a-z`; \
CCODE=`echo $$LCODE | sed 's/-.*//'`; \
sed -e "s|@LNAME@|$$LNAME|g" -e "s|@LCODE@|$$LCODE|g" \
-e "s|@CCODE@|$$CCODE|g" \
@@ -1865,7 +1870,7 @@
# Install files generated by setup into package directories
langpacks: $(STAMP_DIR)/langpacks
-$(STAMP_DIR)/langpacks: $(STAMP_DIR)/install $(STAMP_DIR)/install-indep $(shell readlink debian/scripts/openoffice-xlate-lang | sed -e 's,../../,,')
+$(STAMP_DIR)/langpacks: $(STAMP_DIR)/install $(STAMP_DIR)/install-indep ooo-build/bin/openoffice-xlate-lang
# remove empty uno_packages dirs somehow in the langpacks(?)
for iso in `echo $(LANGPACKISOS) | tr A-Z a-z`; do \
@@ -2629,7 +2634,7 @@
# install openoffice-xlate-lang
install -d -m755 $(PKGDIR)-common/usr/share/$(OODIRNAME)/bin
- install -m755 $(shell readlink debian/scripts/openoffice-xlate-lang | sed -e 's,../../,,') \
+ install -m755 ooo-build/bin/openoffice-xlate-lang \
$(PKGDIR)-common/usr/share/$(OODIRNAME)/bin
ifeq "$(HELPISOS)" ""
=== removed symlink 'scripts/openoffice-xlate-lang'
=== target was '../../ooo-build/bin/openoffice-xlate-lang'
Reply to: