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

./packages/openofficeorg/3.0/experimental r1226: m3; merge build fix

------------------------------------------------------------
revno: 1226
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-08-20 06:04:51 +0200
message:
  m3; merge build fix
modified:
  changelog
  control
  rules
    ------------------------------------------------------------
    revno: 1022.1.149
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Wed 2008-08-20 04:48:09 +0200
    message:
      fix if
    modified:
      rules

=== modified file 'changelog'
--- a/changelog	2008-08-16 06:36:27 +0000
+++ b/changelog	2008-08-20 04:04:51 +0000
@@ -1,19 +1,19 @@
-openoffice.org (1:3.0.0~ooo300m2-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.0~ooo300m3-0.1pre) experimental; urgency=low
 
-  * OpenOffice.org 3.0 release branch milestone 2 (OOO300_m2)
+  * OpenOffice.org 3.0 release branch milestone 3 (OOO300_m3)
     - deleting cell contents while spellchecking window is open does now
       not crash in calc anymore in some circumstances (but the text is not
       editable) (closes: #490549)
     - package-ooo: fix install to make help land properly in -help-xx.
   * ooo-build:
-    - update (r13601)
+    - update (r13633)
     - src: get OOO300 GSIs from ftp.linux.cz
   * debian/rules:
     - Add SYSTEM_LUCENE conditional, disable it yet as liblucene2-java is
       in contrib
     - Add SYSTEM_REDLAND conditional
     - reenable the SDK
-    - enable mn (Mongolian); build all languages again
+    - enable mn (Mongolian) and kk (Kazahk); build all languages again
     - remove obsolete [$(OOO_ARCHS)] qualifier from python-dev builddep
       (closes: #491623)
     - build against kde4
@@ -70,7 +70,7 @@
       the SRB also often work with older librpt*/OOo, but that would not work
       with the current packaging due to shlibdeps.
 
- -- Rene Engelhard <rene@debian.org>  Sat, 16 Aug 2008 03:05:16 -0300
+ -- Rene Engelhard <rene@debian.org>  Tue, 19 Aug 2008 21:27:44 +0200
 
 openoffice.org (1:3.0.0~beta2-1) experimental; urgency=low
 

=== modified file 'control'
--- a/control	2008-08-16 05:49:17 +0000
+++ b/control	2008-08-20 04:04:51 +0000
@@ -1427,6 +1427,33 @@
  install extra dictionaries/hyphenation patterns/thesauri independently of
  the language packs.
 
+Package: openoffice.org-l10n-kk
+Architecture: all
+Depends: locales | belocs-locales-data | locales-all
+Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-kk
+Provides: openoffice.org-l10n-${help-l10n-virtual-version}, openoffice.org2-l10n-kk
+Suggests: hunspell-dictionary-kk | myspell-dictionary-kk, openoffice.org-hyphenation-kk, openoffice.org2-thesaurus-kk, openoffice.org-help-kk
+Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>= ${base-version}.1), openoffice.org2-l10n-kk
+Replaces: openoffice.org2-l10n-kk
+Description: Kazahk 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
+ Kazahk. 
+ 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.
+
 Package: openoffice.org-l10n-km
 Architecture: all
 Depends: locales (>= 2.3.5-12) | belocs-locales-data | locales-all

=== modified file 'rules'
--- a/rules	2008-08-16 17:59:23 +0000
+++ b/rules	2008-08-20 04:04:51 +0000
@@ -504,8 +504,8 @@
 	#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 \
+	  ka kk 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 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 \
@@ -513,8 +513,8 @@
 	#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 pa-IN \
-	  pl pt pt-BR ro ru rw sk sl sr ss st sv \
+	  ka kk 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
   endif
 else
@@ -1646,7 +1646,7 @@
 			openoffice.org-base/$(OODIR)/program/classes/sdbc_hsqldb.jar
 	# we need this in -base. Otherwise we get unwanted package differences
 	# in the unstable version and backports which might use internal hsqldb
-  ifneq "$(SYSTEM_HSQLDB)" "y"
+  ifneq "$(USE_SYSTEM_HSQLDB)" "y"
 	mkdir -p debian/tmp/pkg/openoffice.org-base/$(OODIR)/program/classes
 	mv debiam/tmp/pkg/openoffice.org-common/$(OODIR)/program/classes/hsqldb.jar \
 		debian/tmp/pkg/openoffice.org-base/$(OODIR)/program/classes
@@ -3059,7 +3059,7 @@
 			-Sdebian/uno-libs3/$(OOUREDIR)/lib \
 			-Sdebian/ure/$(OOUREDIR)/lib \
 			$(SOURCE_TREE)/xpdf/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/xpdfimport \
-			$(SOURCE_TREE)/filter/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/pdfimport.uno.so \
+			$(SOURCE_TREE)/sdext/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/pdfimport.uno.so \
 			> debian/openoffice.org$(VER)-pdfimport.substvars
 endif
 ifeq "$(ENABLE_MONO)" "y"
@@ -3105,7 +3105,7 @@
 endif
 ifeq "$(ENABLE_PDFIMPORT)" "y"
 	dh_gencontrol -popenoffice.org$(VER)-pdfimport -- \
-		-v$(shell grep "<version" $(SOURCE_TREE)/filter/source/pdfimport/config/description.xml | perl -pi -e 's,<version.*value=\"(.*)\" />,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
+		-v$(shell grep "<version" $(SOURCE_TREE)/sdext/source/pdfimport/config/description.xml | perl -pi -e 's,<version.*value=\"(.*)\" />,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
 endif
 ifeq "$(ENABLE_MINIMIZER)" "y"
 	dh_gencontrol -popenoffice.org$(VER)-presentation-minimizer -- \
Reply to: