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

r879 ./packages/openofficeorg/2.3/experimental: m4, GSI fixes



------------------------------------------------------------
revno: 879
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2007-09-06 16:24:34 +0200
message:
  m4, GSI fixes
modified:
  README.Debian-source
  changelog
  rules
=== modified file 'README.Debian-source'
--- a/README.Debian-source	2007-07-17 21:27:54 +0000
+++ b/README.Debian-source	2007-09-06 14:24:34 +0000
@@ -1,5 +1,5 @@
 The .orig.tar.gz consists of the 5 seperate tarballs from
-http://ftp.stardiv.de/pub/OpenOffice.org/stable/2.2.0 of which some non-free stuff has been removed:
+http://ftp.stardiv.de/pub/OpenOffice.org/stable/2.3.0 of which some non-free stuff has been removed:
  * core:
    - external/jars/*: Sun proprietary, binary-only jars
    - odk/pack/copying/*.pdf: non-free doc (XML Spec)

=== modified file 'changelog'
--- a/changelog	2007-09-06 09:53:56 +0000
+++ b/changelog	2007-09-06 14:24:34 +0000
@@ -1,15 +1,20 @@
-openoffice.org (1:2.3.0~rc1-1.2pre) experimental; urgency=low
+openoffice.org (1:2.3.0~rc2-0.1pre) experimental; urgency=low
 
+  * OpenOffice.org 2.3.0rc2 (OOG680_m4)
   * ooo-build:
-    - update (r10217)
+    - update (r10222)
+    - src: update GSIs: bg cs da et vi
   * debian/rules:
     - build against db4.5 on sid (closes: #431786)
     - build with system-boost again
+    - remove apparently obsolete OOO_LICENSE change to the GSIs
+    - do not corrupt the ku GSI
   * debian/control.*.in:
     - migrate to new Homepage: field instead of adding it to the package
       description
+  * debian/README.Debian-source: s/2.2.0/2.3.0/
 
- -- Rene Engelhard <rene@debian.org>  Thu,  6 Sep 2007 11:06:08 +0200
+ -- Rene Engelhard <rene@debian.org>  Thu,  6 Sep 2007 14:49:45 +0200
 
 openoffice.org (1:2.3.0~rc1-1) experimental; urgency=low
 

=== modified file 'rules'
--- a/rules	2007-09-06 09:53:56 +0000
+++ b/rules	2007-09-06 14:24:34 +0000
@@ -57,17 +57,17 @@
 #MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
 # For SRC680 milestones, use only ~mX
 #MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2)//)
-MILESTONE=m3
-TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
-#TAG=$(MWS)_$(MILESTONE)
+MILESTONE=m4
+#TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
+TAG=$(MWS)_$(MILESTONE)
 #OOO_BUILD_BRANCH=ooo-build-2-3
 SOURCE_TREE=ooo-build/build/$(TAG)
 STAMP_DIR=debian/stampdir
 
-CORE_TARBALL=$(TAG)-core.tar.bz2
-SYSTEM_TARBALL=$(TAG)-system.tar.bz2
-#CORE_TARBALL=OOo_2.3.0_src_core.tar.bz2
-#SYSTEM_TARBALL=OOo_2.3.0_src_system.tar.bz2
+#CORE_TARBALL=$(TAG)-core.tar.bz2
+#SYSTEM_TARBALL=$(TAG)-system.tar.bz2
+CORE_TARBALL=OOo_2.3.0_src_core.tar.bz2
+SYSTEM_TARBALL=OOo_2.3.0_src_system.tar.bz2
 
 ifeq "$(DISTREL)" "etch"
   ETCH_BACKPORT=y
@@ -1186,17 +1186,10 @@
 	find ooo-build/src -name "*.sdf.bz2" -exec bunzip2 -k \{\} \;
 	for i in `find ooo-build/src/*.sdf.gz`; do gunzip -dc "$$i" > \
 		ooo-build/src/`basename $$i .gz`; done
-	# work around broken stuff in the GSI breaking the build in svx
-	for iso in as-IN he lo lv ml-IN mr-IN nb or-IN sh-YU sr-CS ur-IN; do \
-	  case " $(LANGPACKISOS) " in *\ $$iso\ *) ;; *) continue; esac; \
-	  [ -f ooo-build/src/GSI_$$iso.sdf ] || continue; \
-	  TMP=`mktemp -q`; \
-	  grep -v OOO_LICENSE ooo-build/src/GSI_$$iso.sdf \
-	    > $$TMP && mv $$TMP ooo-build/src/GSI_$$iso.sdf; \
-	done
 	# we change the message, and those translations therefore don't match anymore.
 	for iso in $(LANGPACKISOS); do \
 	  [ -f ooo-build/src/GSI_$$iso.sdf ] || continue; \
+	  if [ "$$iso" = "ku" ]; then continue; fi \
 	  TMP=`mktemp -q`; \
 	  grep -v RID_STR_EXTENSION_NOT_PRESENT ooo-build/src/GSI_$$iso.sdf \
 	    > $$TMP && mv $$TMP ooo-build/src/GSI_$$iso.sdf; \


Reply to: