CVS:oo-deb/debian changelog,1.356,1.357 rules,1.227,1.228
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv6983/debian
Modified Files:
changelog rules
Log Message:
on Java builds, remove jvm*.res from the langpacks; they are supposed
to put into -java only and they otherwise cause file conflicts, thanks
Joseph Cole for the report
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -d -r1.356 -r1.357
--- changelog 25 Jul 2004 15:59:43 -0000 1.356
+++ changelog 26 Jul 2004 09:06:43 -0000 1.357
@@ -23,6 +23,9 @@
- add ARM to checks in makebinariestar [PN, RE]
- add hack to apply Linux/ARM support patch [RE]
- get/use ooo-build-1-1 branch of ooo-build in get-ooo-build [RE]
+ - on Java builds, remove jvm*.res from the langpacks; they are supposed
+ to put into -java only and they otherwise cause file conflicts, thanks
+ Joseph Cole for the report [RE]
* debian/openoffice.org-bin.install:
- add ARM support [PN]
* debian/MANIFEST.arm: add [PN, RE]
@@ -30,7 +33,7 @@
* debian/patches/linux-arm-support.diff: add as hack until it could be
added to ooo-build... [RE]
- -- Rene Engelhard <rene@debian.org> Sun, 25 Jul 2004 17:06:41 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 26 Jul 2004 11:06:28 +0200
openoffice.org (1.1.2-2) unstable; urgency=low
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -d -r1.227 -r1.228
--- rules 25 Jul 2004 15:59:43 -0000 1.227
+++ rules 26 Jul 2004 09:06:43 -0000 1.228
@@ -1101,6 +1101,18 @@
# remove files in -sl langauge pack conflicting with openoffice.org
rm -rf debian/openoffice.org$(VER)-l10n-sl$(OPENOFFICEDIR)/user/config
+ifeq "$(USE_JAVA)" "y"
+ # remove jvm645??.res from the langpacks because it is supposed to
+ # be in -java only
+ for iso in $(LANGPACKISOS); do \
+ langiso=`echo $$iso | tr A-Z a-z`; \
+ prefix=`debian/local/openoffice-xlate-lang -p $$iso`;\
+ if [ -f $(MAINPKGDIR)-l10n-$$langiso$(OPENOFFICEDIR)/program/resource/jvm$(BUILDNUM)$$prefix.res; \
+ rm -f $(MAINPKGDIR)-l10n-$$langiso$(OPENOFFICEDIR)/program/resource/jvm$(BUILDNUM)$$prefix.res; \
+ fi; \
+ done
+endif
+
touch $@
Reply to: