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

r814 ./packages/openofficeorg/2.3/experimental: * debian/rules

------------------------------------------------------------
revno: 814
committer: Chris Cheney <ccheney@debian.org>
branch nick: experimental
timestamp: Wed 2007-08-01 13:14:46 -0500
message:
    * debian/rules
      - add DBVER substition [CC]
      - add various JAVA_GCJ_DEPENDS native code libraries [CC]
    * debian/NEWS: remove, obsolete [CC]
    * debian/template.desktop.in:
      - update Name and Comment fields [CC]
      - add translations [CC]
removed:
  NEWS
modified:
  changelog
  control.help.in
  control.lang.in
  control.sdk.in
  rules
  template.desktop.in

=== removed file 'NEWS'
--- a/NEWS	2005-11-05 00:26:39 +0000
+++ b/NEWS	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-openoffice.org (1.1.2-2) unstable; urgency=low
-
-  * Previous versions of the openoffice.org-bin package created less than
-    optimal entries in the users ~/.mailcap file during setup. These entries
-    conflict with the one provided by the openoffice.org-debian-files
-    package. If you don't have another version of openoffice.org installed,
-    you can safely remove the lines about openoffice in each user ~/.mailcap
-    file.
-
- -- Rene Engelhard <rene@debian.org>  Mon,  5 Jul 2004 16:47:24 +0200
-
-openoffice.org (1.1.0-1) unstable; urgency=low
-
-  * As part of the integration of Ximian's work, openoffice
-    now uses fontconfig to determine the installed fonts on
-    your system.  Fonts that were installed using the 'spadmin'
-    tool in a non-standard directory are no longer supported.
-    You should move those fonts to a directory that fontconfig
-    knows about, such as ~/.fonts or /usr/share/fonts.
-  
- -- Chris Halls <halls@debian.org>  Thu,  2 Oct 2003 20:04:15 +0200
-

=== modified file 'changelog'
--- a/changelog	2007-08-01 08:56:31 +0000
+++ b/changelog	2007-08-01 18:14:46 +0000
@@ -50,6 +50,8 @@
     - wrap various java code with ENABLE_JAVA [CC]
     - wrap ooo-build pruning with PRUNE_OOOBUILD [CC]
     - simplify uuencode/uudecode code [CC]
+    - add DBVER substition [CC]
+    - add various JAVA_GCJ_DEPENDS native code libraries [CC]
   * debian/control.in:
     - build-depend on libxml-parser-perl [RE]
     - Add XS-Vcs-{Bzr,Svn} fields [RE]
@@ -71,6 +73,10 @@
     install/package the reportdesigner extension [RE]
   * debian/rules, debian/*.menu.in, debian/*.overrides.lintian.in:
     add version number to the icon= entry dynamically [RE]
+  * debian/NEWS: remove, obsolete [CC]
+  * debian/template.desktop.in:
+    - update Name and Comment fields [CC]
+    - add translations [CC]
 
    (CC = Chris Cheney)
 

=== modified file 'control.help.in'
--- a/control.help.in	2007-02-13 16:49:57 +0000
+++ b/control.help.in	2007-08-01 18:14:46 +0000
@@ -12,7 +12,4 @@
  .
  This package contains the help of OpenOffice.org in
  @LNAME@. 
- .
- For latest news on OpenOffice.org in Debian, see
- http://openoffice.debian.net
 

=== modified file 'control.lang.in'
--- a/control.lang.in	2006-10-25 07:49:10 +0000
+++ b/control.lang.in	2007-08-01 18:14:46 +0000
@@ -30,7 +30,4 @@
  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
 

=== modified file 'control.sdk.in'
--- a/control.sdk.in	2007-06-28 09:42:00 +0000
+++ b/control.sdk.in	2007-08-01 18:14:46 +0000
@@ -25,9 +25,6 @@
  This package contains the files needed to build plugins/add-ons for
  OpenOffice.org (includes, IDL files, build tools, ...). It also contains
  the zipped source of the UNO Java libraries for use in IDEs like eclipse.
- .
- For latest news on OpenOffice.org in Debian, see
- http://openoffice.debian.net
 
 Package: openoffice.orgVER-dev-doc
 Section: doc
@@ -51,7 +48,4 @@
   * C++/Java/Basic examples
  .
  It also contains the Javadoc of the XMerge API.
- .
- For latest news on OpenOffice.org in Debian, see
- http://openoffice.debian.net
 

=== modified file 'rules'
--- a/rules	2007-08-01 08:56:31 +0000
+++ b/rules	2007-08-01 18:14:46 +0000
@@ -137,6 +137,7 @@
 USE_LIBSUITESPARSE=y
 USE_BZIP_COMPRESS=n
 PRUNE_OOOBUILD=y
+DBVER=4.4
 
 # when we have a package we want to have to be installed on older things with some older
 # C++ ABI (like it was the case with openoffice.org2), we need to set this. Don't touch
@@ -186,41 +187,45 @@
 ifeq "$(DIST)" "Ubuntu"
   # common settings
   PATCHSET=$(DIST)$(shell perl -e 'print ucfirst("$(DISTREL)");')
-  USE_FIREFOX=y
-  SYSTEM_ALTLINUXHYPH=n
   CONFIGURE_FLAGS += \
        --with-intro-bitmaps=$(CURDIR)/ubuntu/openintro_ubuntu.bmp \
        --with-about-bitmaps=$(CURDIR)/ubuntu/openabout_ubuntu.bmp
-  USE_OOO_BUILD_DESKTOPS=y
+
+  BUILD_DEPS += , translate-toolkit
+
   BUILD_DBG_PACKAGE=n
+  PRUNE_OOOBUILD=n
+  SYSTEM_ALTLINUXHYPH=n
   USE_BZIP_COMPRESS=y
+  USE_FIREFOX=y
+  USE_OOO_BUILD_DESKTOPS=y
+  USE_PYCENTRAL=y
   USE_SYSTEM_LPSOLVE=n
   USE_SYSTEM_PORTAUDIO=n
-  PRUNE_OOOBUILD=n
-
-  BUILD_DEPS += , translate-toolkit
+  USE_SYSTEM_XMLSEC=n
 
   ifeq "$(DISTREL)" "gutsy"
 
   else ifeq "$(DISTREL)" "feisty"
 
   else ifeq "$(DISTREL)" "edgy"
+    ENABLE_MONO=n
     USE_SYSTEM_HUNSPELL=n
-    ENABLE_MONO=n
 
   else ifeq "$(DISTREL)" "dapper"
+    DBVER=4.3
+
+    BUILD_CAIROCANVAS=n
+    CAIRO_FONTS_PATCH=n
+    ENABLE_MONO=n
+    USE_BZIP_COMPRESS=n
     USE_DBUS=n
-    USE_SYSTEM_HUNSPELL=n
     USE_PYCENTRAL=n
-    USE_SYSTEM_LPSOLVE=n
-    DBVER=4.3
     USE_SYSTEM_DMAKE=n
-    USE_BZIP_COMPRESS=n
+    USE_SYSTEM_HUNSPELL=n
     USE_SYSTEM_LIBWPS=n
-    ENABLE_MONO=n
-    JAVA_GCJ_NATIVE_DEPENDS=
-    BUILD_CAIROCANVAS=n
-    CAIRO_FONTS_PATCH=n
+    USE_SYSTEM_LPSOLVE=n
+
   else # fallback
 
   endif
@@ -444,6 +449,9 @@
   ifeq "$(SYSTEM_XT)" "y"
 	CONFIGURE_FLAGS += --with-system-xt	
 	BUILD_DEPS += , libxt-java (>= 0.20050823) [$(OOO_JAVA_ARCHS)]
+    ifneq "$(ETCH_BACKPORT)" "y"
+	JAVA_GCJ_DEPENDS += , libxt-java-gcj
+    endif
   endif
   ifeq "$(SYSTEM_XERCES)" "y"
 	CONFIGURE_FLAGS += --with-system-xerces
@@ -467,7 +475,9 @@
 	CONFIGURE_FLAGS += --with-system-xml-apis
 	# xml-apis.jar is already a link in xalan, see above
   endif
-	BUILD_DEPS += , libdb4.4-java [$(OOO_JAVA_ARCHS)]
+	CONFIGURE_FLAGS += --with-db-jar=/usr/share/java/libdb$(DBVER)-java.jar
+	BUILD_DEPS += , libdb$(DBVER)-dev [$(OOO_JAVA_ARCHS)]
+	BUILD_DEPS += , libdb$(DBVER)-java [$(OOO_JAVA_ARCHS)]
   ifeq "$(DIST)" "Debian"
 	BUILD_DEPS += , mingw32 [$(OOO_JAVA_ARCHS)]
 	CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
@@ -539,9 +549,6 @@
       BUILD_DEPS += , libstlport4.6-dev $(LIBSTLPORT_MINVER) [$(OOO_ARCHS)]
       DEV_STL_DEPENDS=, libstlport4.6-dev $(LIBSTLPORT_MINVER)
     endif
-ifeq "$(USE_STLPORT5)" "y"
-else
-endif
     CONFIGURE_FLAGS+= --with-stlport=$(CURDIR)/stlport
   endif
 endif
@@ -651,6 +658,9 @@
 	BUILD_DEPS += , libhsqldb-java (>= 1.8.0.0-2) [$(OOO_JAVA_ARCHS)]
 	BASE_HSQLDB_DEPENDS = libhsqldb-java (>= 1.8.0.0-2)
 	CONFIGURE_FLAGS+= --with-system-hsqldb
+    ifneq "$(ETCH_BACKPORT)" "y"
+	JAVA_GCJ_DEPENDS += , libhsqldb-java-gcj
+    endif
   endif
 
   ifeq "$(USE_SYSTEM_BSH)" "y"

=== modified file 'template.desktop.in'
--- a/template.desktop.in	2007-04-23 12:19:01 +0000
+++ b/template.desktop.in	2007-08-01 18:14:46 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=OpenOffice.org@VER@
-Comment=OpenOffice.org
+Name=OpenOffice.org@VER@ From Template
+Comment=OpenOffice.org From Template
 TryExec=oofromtemplate@VER@
 Exec=oofromtemplate@VER@ %U
 Icon=ooo-template.png
@@ -9,3 +9,35 @@
 Type=Application
 Categories=GNOME;Application;Office;X-Ximian-Main;
 StartupNotify=true
+Name[af]=OpenOffice.org@VER@ vanaf sjabloon
+Name[ca]=Des d'una plantilla d'OpenOffice.org@VER@
+Name[cs]=Ze šablony OpenOffice.org@VER@
+Name[da]=OpenOffice.org@VER@ Fra skabelon
+Name[de]=OpenOffice.org@VER@ Aus Vorlage
+Name[el]=OpenOffice.org@VER@ Από πρότυπο
+Name[en]=OpenOffice.org@VER@ From Template
+Name[es]=A partir de una plantilla de OpenOffice.org@VER@
+Name[et]=OpenOffice.org@VER@ mallist
+Name[eu]=OpenOffice.org@VER@ Aus Vorlage
+Name[fi]=OpenOffice.org@VER@ Asiakirjamallipohjasta
+Name[fr]=À partir d'un modèle OpenOffice.org@VER@
+Name[hu]=OpenOffice.org@VER@ sablonból
+Name[it]=OpenOffice.org@VER@ Da modello
+Name[ja]=OpenOffice.org@VER@ テンプレートから
+Name[kn_IN]=OpenOffice.org@VER@ ಸಿದ್ಧವಿನ್ಯಾಸ ಪುಟದಿಂದ
+Name[ko]=OpenOffice.org@VER@ 서식 파일로부터
+Name[lt]=„OpenOffice.org@VER@“ iš šablono
+Name[nl]=OpenOffice.org@VER@ Uit sjabloon
+Name[ns]=OpenOffice.org@VER@ go tšwa go Template
+Name[pl]=OpenOffice.org@VER@ Na podstawie szablonu
+Name[pt_BR]=A partir de um modelo OpenOffice.org@VER@
+Name[ru]=OpenOffice.org@VER@ из шаблона...
+Name[sk]=Zo šablóny OpenOffice.org@VER@
+Name[sl]=OpenOffice.org@VER@ iz predloge
+Name[sv]=Från en OpenOffice.org@VER@-mall
+Name[th]=OpenOffice.org@VER@ จากแม่แบบ
+Name[tr]=OpenOffice.org@VER@ Şablondan
+Name[xh]=OpenOffice.org@VER@ Evela kwi-Template
+Name[zh_CN]=OpenOffice.org@VER@ 采用样式
+Name[zh_TW]=OpenOffice.org@VER@ 採用樣式
+Name[zu]=I-OpenOffice.org@VER@ esuka Oqwenjini lokuphumelelisa
Reply to: