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

CVS:oo-deb/debian changelog,1.338.2.25.2.33,1.338.2.25.2.34 control,1.175.2.8.2.22,1.175.2.8.2.23 control.in,1.142.2.6.2.23,1.142.2.6.2.24 control.lang.in,1.22.2.2.2.3,1.22.2.2.2.4 rules,1.214.2.14.2.31,1.214.2.14.2.32

Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv5485

Modified Files:
      Tag: OPENOFFICE_ORG680
	changelog control control.in control.lang.in rules 
Log Message:
- lighten depends on -d-f, we do not need exact ${base-version}
- fix the suggests of the langpacks
- implement help and langpack packaging of !en-US, preliminary, needs some
  care wrt duplicated files still
- build de, es, fr and it in additon to en-US


Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.142.2.6.2.23
retrieving revision 1.142.2.6.2.24
diff -u -d -r1.142.2.6.2.23 -r1.142.2.6.2.24
--- control.in	3 Apr 2005 00:57:04 -0000	1.142.2.6.2.23
+++ control.in	3 Apr 2005 20:06:49 -0000	1.142.2.6.2.24
@@ -26,7 +26,7 @@
  packages:
   * myspell-dictionary: Myspell dictionaries for use with OpenOffice.org
   * openoffice.orgVER-help: User help
-  * openoffice.org-thesaurus: Thesauri for the use with OpenOffice.org
+  * openoffice.org2-thesaurus: Thesauri for the use with OpenOffice.org
   * openoffice.org-hyphenation: Hyphenation patterns for OpenOffice.org
   * ooqstart-gnome/oooqs-kde: Quick start applet for Gnome/KDE desktops
   * openoffice.org-gnome: Gtk UI Plugin, GNOME VFS, GConf and GNOME File Picker
@@ -53,7 +53,7 @@
 
 Package: openoffice.orgVER-core
 Architecture: i386 powerpc s390 sparc
-Depends: openoffice.orgVER-debian-files (>> ${base-version}), openoffice.orgVER-common (>> ${base-version}), openoffice.orgVER-l10n-en-us (>> ${base-version}) | openoffice.orgVER-l10n-${base-version}, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ttf-opensymbol, ${shlibs:Depends}, libnss3 (>= 1.7.5), libnspr4, debconf (>= 1.2.0) | debconf-2.0
+Depends: openoffice.orgVER-debian-files (>> 1.9), openoffice.orgVER-common (>> ${base-version}), openoffice.orgVER-l10n-en-us (>> ${base-version}) | openoffice.orgVER-l10n-${base-version}, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ttf-opensymbol, ${shlibs:Depends}, libnss3 (>= 1.7.5), libnspr4, debconf (>= 1.2.0) | debconf-2.0
 Description: OpenOffice.org office suite architecture dependent files
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.14.2.31
retrieving revision 1.214.2.14.2.32
diff -u -d -r1.214.2.14.2.31 -r1.214.2.14.2.32
--- rules	31 Mar 2005 22:15:55 -0000	1.214.2.14.2.31
+++ rules	3 Apr 2005 20:06:49 -0000	1.214.2.14.2.32
@@ -50,6 +50,13 @@
   PATCHSET=Debian
 endif
 
+#ISOS="$(shell ooo-build/bin/openoffice-xlate-lang -i all)"
+ISOS:="en-US de es fr it"
+#HELPISOS:=$(shell ooo-build/bin/openoffice-xlate-lang -i all)
+HELPISOS:=en-US de es fr it
+#LANGPACKISOS:=$(shell ooo-build/bin/openoffice-xlate-lang -i all)
+LANGPACKISOS:=en-US de es fr it
+
 # Default flags to pass to configure of ooo-build
 CONFIGURE_FLAGS= --disable-post-install-scripts \
                  --with-tag=$(TAG) \
@@ -59,7 +66,8 @@
 		 --enable-package-directories \
 		 --with-installed-ooo-dirname=openoffice$(VER) \
 		 --with-binsuffix=2 \
-		 --mandir=/usr/share/man
+		 --mandir=/usr/share/man \
+		 --with-lang=$(ISOS)
 
 #		 --with-ooo-builddir=$(CURDIR) \
 #		 --with-src=$(CURDIR) \
@@ -189,24 +197,22 @@
 	    -e "s#%[A-Za-z]*=[^%]*%##g#" \
 	    < debian/control.in > debian/control
 
-#	for LNUM in `ooo-build/bin/openoffice-xlate-lang -p all ` ; do \
-	# TOOD - all langpacks
-	for LNUM in en-US ; do \
-	    LNAME=`ooo-build/bin/openoffice-xlate-lang -l $$LNUM`; \
+	for LNUM in $(LANGPACKISOS) ; do \
+	    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`; \
 	    SUGGESTS=; \
 	    sed -e "s|@LNAME@|$$LNAME|g" -e "s|@LCODE@|$$LCODE|g" \
 	        -e "s|@SUGGESTS@|$$SUGGESTS|g" \
 			-e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
 	        >> debian/control < debian/control.lang.in; \
+	done
+	for LNUM in $(HELPISOS) ; do \
+	    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`; \
 	    sed -e "s|@LNAME@|$$LNAME|g" -e "s|@LCODE@|$$LCODE|g" \
 			-e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
 	        >> debian/control < debian/control.help.in; \
 	done
-	# -hi-in was renamed to -hi; add Conflicts:/Replaces:/Provides:
-	perl -pi -e \
-		's/(openoffice.org1.1-l10n-hi)/\1, openoffice.org-l10n-hi-in/' \
-		debian/control
 
 .DELETE_ON_ERROR: debian/control
 
@@ -304,8 +310,8 @@
 
 	rm -rf $(CURDIR)/debian/tmp
 	cd ooo-build ; DESTDIR=$(CURDIR)/debian/tmp $(MAKE) install
-	# install help; we can't do that later since this is in arch-dep
-	# and arch-indep stuff..
+	# install *english* help; we can't do that later since this is in
+	# arch-dep and arch-indep stuff..
 	cd debian/tmp/pkg; \
 		mkdir -p openoffice.org-help-en-us/$(OODIR)/help/en; \
 		for i in common calc math draw writer impress; do \
@@ -342,9 +348,6 @@
 	done
 	touch $@
 
-#LANGPACKISOS:=$(shell ooo-build/bin/openoffice-xlate-lang -i all)
-LANGPACKISOS:=en-US
-
 # Install files generated by setup into package directories
 langpacks: $(STAMP_DIR)/langpacks
 $(STAMP_DIR)/langpacks: $(STAMP_DIR)/install ooo-build/bin/openoffice-xlate-lang
@@ -354,13 +357,30 @@
 	  rm -rf $(PKGDIR)-l10n-$$ext.*.debhelper;\
 	done
 
-	# Install the lang packs TODO
-
-	# For now move stuff out of the -common install
+	# move the english stuff out of the -common install
 	for dir in program/resource share/registry/res/en-US; do \
 	  mkdir -m755 -p $(PKGDIR)-l10n-en-us/$(OODIR)/$$dir ;\
 	  cp -r --preserve=mode debian/tmp/pkg/openoffice.org-common/$(OODIR)/$$dir/* \
 			$(PKGDIR)-l10n-en-us/$(OODIR)/$$dir || exit 1;\
+	done
+
+	# ... and install the rest of the langpacks
+	# FIXME: Filter stuff out which are doubled...
+	for iso in $(LANGPACKISOS); do \
+	  if [ "$$iso" = "en-US" ]; then continue; fi ; \
+	  pkgiso=`echo $$iso | tr \[:upper:\] \[:lower:\]`; \
+	  rm -rf $(PKGDIR)-l10n-$$pkgiso $(PKGDIR)-l10n-$$pkgiso.*.debhelper; \
+	  cp -r --preserve=mode debian/tmp/pkg/openoffice.org-l10n-$$pkgiso \
+		$(PKGDIR)-l10n-$$pkgiso || exit 1; \
+	done
+
+	# move the help out of the langpacks into the help packages...
+	for iso in $(HELPISOS); do \
+	  if [ "$$iso" = "en-US" ]; then continue; fi ; \
+	  pkgiso=`echo $$iso | tr \[:upper:\] \[:lower:\]`; \
+	  mkdir -p $(PKGDIR)-help-$$pkgiso/$(OODIR); \
+	  mv $(PKGDIR)-l10n-$$pkgiso/$(OODIR)/help \
+		$(PKGDIR)-help-$$pkgiso/$(OODIR); \
 	done
 
 	touch $@

Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.338.2.25.2.33
retrieving revision 1.338.2.25.2.34
diff -u -d -r1.338.2.25.2.33 -r1.338.2.25.2.34
--- changelog	3 Apr 2005 00:57:04 -0000	1.338.2.25.2.33
+++ changelog	3 Apr 2005 20:06:48 -0000	1.338.2.25.2.34
@@ -17,7 +17,7 @@
     - --enable-binfilter
   * build with java, use gij/gcj.
     (closes: #289542, #265134)
-  * debian/control.in:
+  * debian/control*.in:
     - add Build-Depends: gij-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7),
       g++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), libldap2-dev,
       libexpat1-dev, libbgnomevfs2-dev, libsndfile1-dev, libant1.6-java,
@@ -38,12 +38,11 @@
     - remove openoffice.org-java stuff [RE]
     - Suggest mozilla-browser | mozilla-firefox | mozilla-thunderbird since
       we need the Mozilla profile for XML Security... [RE]
-    - also use ${base-version} at the -debian-files dependency in -core [RE]
     - add openoffice.org2-filter-so52 [RE]
     - temporarily build-depend on epm since --disable-epm is not working
       at the moment.
-  * debian/control.help.in:
     - add openoffice.org-help-* stuff [RE]
+    - fix langpack Suggests [RE]
   * debian/rules:
    - remove CONFIGURE_OPTIONS, now done by ooo-build and
      distro-configs/Debian.conf[.in] [RE]
@@ -74,9 +73,13 @@
      of the size and because there shouldn't be that much people needing
      SO 5.2 filters anymore, and those who do can install this package :) [RE]
    - some cleanup [RE]
+   - add installation of localized helps and langpacks (although that needs
+     to be enchanced to avoid duplicated files needlessly) [RE]
+   - build de, es, fr and it in addition to en-US, rest has some problems
+     atm, and package -help-* and --l10n-* for them [RE]
   * debian/java-gcj-compat_1.0.14.orig.tar.gz.uu: add [RE]
 
- -- Rene Engelhard <rene@debian.org>  Sun,  3 Apr 2005 02:51:07 +0200
+ -- Rene Engelhard <rene@debian.org>  Sun,  3 Apr 2005 21:53:16 +0200
 
 openoffice.org2 (1.9.76-0pre) experimental; urgency=low
 

Index: control.lang.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.lang.in,v
retrieving revision 1.22.2.2.2.3
retrieving revision 1.22.2.2.2.4
diff -u -d -r1.22.2.2.2.3 -r1.22.2.2.2.4
--- control.lang.in	25 Feb 2005 21:52:10 -0000	1.22.2.2.2.3
+++ control.lang.in	3 Apr 2005 20:06:49 -0000	1.22.2.2.2.4
@@ -2,7 +2,7 @@
 Architecture: all
 Depends: openoffice.orgVER-core (>> ${base-version}) | language-support-@LCODE@
 Provides: openoffice.org-l10n-${base-version}
-Suggests: myspell-dictionary-@LCODE@, openoffice.org-hyphenation-@LCODE@, openoffice.org-thesaurus-@LCODE@, openoffice.org-help-@LCODE@
+Suggests: myspell-dictionary-@LCODE@, openoffice.org-hyphenation-@LCODE@, openoffice.org2-thesaurus-@LCODE@, openoffice.org-help-@LCODE@-${base-version}
 Description: @LNAME@ language package for OpenOffice.org
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.175.2.8.2.22
retrieving revision 1.175.2.8.2.23
diff -u -d -r1.175.2.8.2.22 -r1.175.2.8.2.23
--- control	3 Apr 2005 00:57:02 -0000	1.175.2.8.2.22
+++ control	3 Apr 2005 20:06:48 -0000	1.175.2.8.2.23
@@ -26,7 +26,7 @@
  packages:
   * myspell-dictionary: Myspell dictionaries for use with OpenOffice.org
   * openoffice.org2-help: User help
-  * openoffice.org-thesaurus: Thesauri for the use with OpenOffice.org
+  * openoffice.org2-thesaurus: Thesauri for the use with OpenOffice.org
   * openoffice.org-hyphenation: Hyphenation patterns for OpenOffice.org
   * ooqstart-gnome/oooqs-kde: Quick start applet for Gnome/KDE desktops
   * openoffice.org-gnome: Gtk UI Plugin, GNOME VFS, GConf and GNOME File Picker
@@ -53,7 +53,7 @@
 
 Package: openoffice.org2-core
 Architecture: i386 powerpc s390 sparc
-Depends: openoffice.org2-debian-files (>> ${base-version}), openoffice.org2-common (>> ${base-version}), openoffice.org2-l10n-en-us (>> ${base-version}) | openoffice.org2-l10n-${base-version}, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ttf-opensymbol, ${shlibs:Depends}, libnss3 (>= 1.7.5), libnspr4, debconf (>= 1.2.0) | debconf-2.0
+Depends: openoffice.org2-debian-files (>> 1.9), openoffice.org2-common (>> ${base-version}), openoffice.org2-l10n-en-us (>> ${base-version}) | openoffice.org2-l10n-${base-version}, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ttf-opensymbol, ${shlibs:Depends}, libnss3 (>= 1.7.5), libnspr4, debconf (>= 1.2.0) | debconf-2.0
 Description: OpenOffice.org office suite architecture dependent files
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
@@ -231,13 +231,121 @@
 Architecture: all
 Depends: openoffice.org2-core (>> ${base-version}) | language-support-en-us
 Provides: openoffice.org-l10n-${base-version}
-Suggests: myspell-dictionary-en-us, openoffice.org-hyphenation-en-us, openoffice.org-thesaurus-en-us, openoffice.org-help-en-us
-Description: english_american language package for OpenOffice.org
+Suggests: myspell-dictionary-en-us, openoffice.org-hyphenation-en-us, openoffice.org2-thesaurus-en-us, openoffice.org-help-en-us-${base-version}
+Description: English_american language package for OpenOffice.org
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
  This package contains the localization of OpenOffice.org in
- english_american. 
+ English_american. 
+ It contains the user interface, the templates and the autotext features.
+ (please note that not all this is available for all possible languages). 
+ You can switch user interface language using the locales system.
+ .
+ Spelling dictionaries, hyphenation patterns, thesauri and help are not
+ included in this package. There are some available in separate packages
+ (myspell-*, openoffice.org-hyphenation-*, openoffice.org-thesaurus-*,
+ openoffice.org-help-*)
+ .
+ If you just want to be able to spellcheck etc. in other languages, you can
+ install extra dictionaries/hyphenation patterns/thesauri independently of
+ the language packs.
+ .
+ For latest news on OpenOffice.org in Debian, see
+ http://openoffice.debian.net
+
+Package: openoffice.org2-l10n-de
+Architecture: all
+Depends: openoffice.org2-core (>> ${base-version}) | language-support-de
+Provides: openoffice.org-l10n-${base-version}
+Suggests: myspell-dictionary-de, openoffice.org-hyphenation-de, openoffice.org2-thesaurus-de, openoffice.org-help-de-${base-version}
+Description: German language package for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the localization of OpenOffice.org in
+ German. 
+ It contains the user interface, the templates and the autotext features.
+ (please note that not all this is available for all possible languages). 
+ You can switch user interface language using the locales system.
+ .
+ Spelling dictionaries, hyphenation patterns, thesauri and help are not
+ included in this package. There are some available in separate packages
+ (myspell-*, openoffice.org-hyphenation-*, openoffice.org-thesaurus-*,
+ openoffice.org-help-*)
+ .
+ If you just want to be able to spellcheck etc. in other languages, you can
+ install extra dictionaries/hyphenation patterns/thesauri independently of
+ the language packs.
+ .
+ For latest news on OpenOffice.org in Debian, see
+ http://openoffice.debian.net
+
+Package: openoffice.org2-l10n-es
+Architecture: all
+Depends: openoffice.org2-core (>> ${base-version}) | language-support-es
+Provides: openoffice.org-l10n-${base-version}
+Suggests: myspell-dictionary-es, openoffice.org-hyphenation-es, openoffice.org2-thesaurus-es, openoffice.org-help-es-${base-version}
+Description: Spanish language package for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the localization of OpenOffice.org in
+ Spanish. 
+ It contains the user interface, the templates and the autotext features.
+ (please note that not all this is available for all possible languages). 
+ You can switch user interface language using the locales system.
+ .
+ Spelling dictionaries, hyphenation patterns, thesauri and help are not
+ included in this package. There are some available in separate packages
+ (myspell-*, openoffice.org-hyphenation-*, openoffice.org-thesaurus-*,
+ openoffice.org-help-*)
+ .
+ If you just want to be able to spellcheck etc. in other languages, you can
+ install extra dictionaries/hyphenation patterns/thesauri independently of
+ the language packs.
+ .
+ For latest news on OpenOffice.org in Debian, see
+ http://openoffice.debian.net
+
+Package: openoffice.org2-l10n-fr
+Architecture: all
+Depends: openoffice.org2-core (>> ${base-version}) | language-support-fr
+Provides: openoffice.org-l10n-${base-version}
+Suggests: myspell-dictionary-fr, openoffice.org-hyphenation-fr, openoffice.org2-thesaurus-fr, openoffice.org-help-fr-${base-version}
+Description: French language package for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the localization of OpenOffice.org in
+ French. 
+ It contains the user interface, the templates and the autotext features.
+ (please note that not all this is available for all possible languages). 
+ You can switch user interface language using the locales system.
+ .
+ Spelling dictionaries, hyphenation patterns, thesauri and help are not
+ included in this package. There are some available in separate packages
+ (myspell-*, openoffice.org-hyphenation-*, openoffice.org-thesaurus-*,
+ openoffice.org-help-*)
+ .
+ If you just want to be able to spellcheck etc. in other languages, you can
+ install extra dictionaries/hyphenation patterns/thesauri independently of
+ the language packs.
+ .
+ For latest news on OpenOffice.org in Debian, see
+ http://openoffice.debian.net
+
+Package: openoffice.org2-l10n-it
+Architecture: all
+Depends: openoffice.org2-core (>> ${base-version}) | language-support-it
+Provides: openoffice.org-l10n-${base-version}
+Suggests: myspell-dictionary-it, openoffice.org-hyphenation-it, openoffice.org2-thesaurus-it, openoffice.org-help-it-${base-version}
+Description: Italian language package for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the localization of OpenOffice.org in
+ Italian. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
  You can switch user interface language using the locales system.
@@ -258,12 +366,68 @@
 Architecture: all
 Recommends: openoffice.org2-core (>> ${base-version}) | language-support-en-us
 Provides: openoffice.org-help-${base-version}
-Description: english_american help for OpenOffice.org
+Description: English_american help for OpenOffice.org
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
  This package contains the localization of OpenOffice.orgs help in
- english_american. 
+ English_american. 
+ .
+ For latest news on OpenOffice.org in Debian, see
+ http://openoffice.debian.net
+
+Package: openoffice.org2-help-de
+Architecture: all
+Recommends: openoffice.org2-core (>> ${base-version}) | language-support-de
+Provides: openoffice.org-help-${base-version}
+Description: German help for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the localization of OpenOffice.orgs help in
+ German. 
+ .
+ For latest news on OpenOffice.org in Debian, see
+ http://openoffice.debian.net
+
+Package: openoffice.org2-help-es
+Architecture: all
+Recommends: openoffice.org2-core (>> ${base-version}) | language-support-es
+Provides: openoffice.org-help-${base-version}
+Description: Spanish help for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the localization of OpenOffice.orgs help in
+ Spanish. 
+ .
+ For latest news on OpenOffice.org in Debian, see
+ http://openoffice.debian.net
+
+Package: openoffice.org2-help-fr
+Architecture: all
+Recommends: openoffice.org2-core (>> ${base-version}) | language-support-fr
+Provides: openoffice.org-help-${base-version}
+Description: French help for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the localization of OpenOffice.orgs help in
+ French. 
+ .
+ For latest news on OpenOffice.org in Debian, see
+ http://openoffice.debian.net
+
+Package: openoffice.org2-help-it
+Architecture: all
+Recommends: openoffice.org2-core (>> ${base-version}) | language-support-it
+Provides: openoffice.org-help-${base-version}
+Description: Italian help for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the localization of OpenOffice.orgs help in
+ Italian. 
  .
  For latest news on OpenOffice.org in Debian, see
  http://openoffice.debian.net
Reply to: