./packages/openofficeorg/3.0/experimental r1204: whitespace and spelling fixes

To: debian-openoffice@lists.debian.org
Subject: ./packages/openofficeorg/3.0/experimental r1204: whitespace and spelling fixes
From: Chris Cheney <ccheney@ubuntu.com>
Date: Wed, 30 Jul 2008 14:29:08 -0500
Message-id: <[🔎] E1KOHN8-0008MQ-FC@alioth.debian.org>

------------------------------------------------------------
revno: 1204
committer: Chris Cheney <ccheney@ubuntu.com>
branch nick: experimental
timestamp: Wed 2008-07-30 14:29:08 -0500
message:
  whitespace and spelling fixes
  fixup openoffice.org-help-en-us Depends rewrite
  remove an Ubuntu special case (not needed anymore)
  add $(BUILDDEB_OPTIONS) back to dh_builddeb its needed by bzip2/lzma
modified:
  rules

=== modified file 'rules'
--- a/rules	2008-07-30 19:16:08 +0000
+++ b/rules	2008-07-30 19:29:08 +0000
@@ -466,9 +466,9 @@
 
 ifeq "$(ENABLE_JAVA)" "y"
   ifeq "$(PACKAGE_WRITER2LATEX)" "n"
-       CONFIGURE_FLAGS += --without-writer2latex
+	CONFIGURE_FLAGS += --without-writer2latex
     ifeq "$(USE_EXTERNAL_WRITER2LATEX)" "y"
-       WRITER_W2L_DEP = openoffice.org-writer2latex
+	WRITER_W2L_DEP = openoffice.org-writer2latex
     endif
   endif
 endif
@@ -571,7 +571,7 @@
 	DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e s/awt/dbg/)
 	JAVA_RUNTIME_DEPENDS = default-jre | java-gcj-compat
 #  ifneq (,$(GCJ_JAWT_DEPENDS))
-#    	JAVA_RUNTIME_DEPENDS += | $(GCJ_JAWT_DEPENDS)
+#	JAVA_RUNTIME_DEPENDS += | $(GCJ_JAWT_DEPENDS)
 #  endif
   ifneq (,$(filter $(ARCH), amd64 i386 sparc powerpc alpha mips mipsel m68k s390))
 	JAVA_RUNTIME_DEPENDS += | openjdk-6-jre
@@ -653,7 +653,7 @@
 	BUILD_DEPS+= , xulrunner-dev-static [$(OOO_MOZILLA_ARCHS)], libnss3-dev [$(OOO_MOZILLA_ARCHS)]
       else
         ifeq "$(MOZILLA)" "iceape"
-        BUILD_DEPS += , $(MOZILLA)-dev (>= 1.1.9-5) [$(OOO_MOZILLA_ARCHS)], libnss3-dev [$(OOO_MOZILLA_ARCHS)]
+	BUILD_DEPS += , $(MOZILLA)-dev (>= 1.1.9-5) [$(OOO_MOZILLA_ARCHS)], libnss3-dev [$(OOO_MOZILLA_ARCHS)]
         else
 	BUILD_DEPS += , $(MOZILLA)-dev [$(OOO_MOZILLA_ARCHS)]
         endif
@@ -1028,6 +1028,7 @@
 	cd ooo-build ;\
 	rm -rf \
 	 2005-10-23-huston.ppt \
+	 doc/class_diagram.odg \
 	 scratch/buildbot \
 	 scratch/offapi-vba/constants/constant_types.rdb \
 	 src/*.ico \
@@ -1042,7 +1043,6 @@
 	 patches/test/*.tar \
 	 www/images/*.png \
 	 www/l10n/*.gif \
-	 doc/class_diagram.odg
 	 if [ -d ooo-build/test ]; then \
 		find ooo-build/test ooo-build/doc ooo-build/scratch -type f \
 			\( -name '*.123' -o -name '*.doc' -o -name '*.lwp' \
@@ -1275,7 +1275,7 @@
 	        >> debian/control < debian/control.help.in; \
 	done
 	# en_US is in -common
-	perl -pi -e 's|(Depends: openoffice.org$(VER)-writer), openoffice.org$(VER)-l10n-en-us|\1|' \
+	perl -pi -e 's|(Depends: openoffice.org$(VER)-writer \| language-support-translations-en), openoffice.org$(VER)-l10n-en-us|\1|' \
 		debian/control
 	perl -pi -e 's|(Depends: openoffice.org$(VER)-writer, openoffice.org$(VER)-l10n-en-us)|\1, ttf-devanagari-fonts|' \
 		debian/control
@@ -1864,8 +1864,7 @@
 	: # remove problematic ones
 	rm -f debian/tmp/native-jars/ridl.jar
 	: # compile the others
-ifneq "$(DIST)" "Ubuntu"
-  ifneq "$(ETCH_BACKPORT)" "y"
+ifneq "$(ETCH_BACKPORT)" "y"
 	# the Debian i386 buildd, although having much ram still OOMs without
 	# this (at unoil.jar).
 	# Also the native jar build is MUCH faster with this. But it
@@ -1885,10 +1884,6 @@
   else
 	AOT_MAKEFLAGS=-j$(NUM_CPUS) aot-compile -L /usr/lib/gcj/openoffice \
 	    debian/tmp/native-jars debian/tmp/native-jars/gcj
-  endif
-else
-	AOT_MAKEFLAGS=-j$(NUM_CPUS) aot-compile -L /usr/lib/gcj/openoffice \
-	    debian/tmp/native-jars debian/tmp/native-jars/gcj
 endif
 	$(GCJ_DBTOOL) -n debian/tmp/native-jars/tmp.db 64
 	find debian/tmp/native-jars/gcj -name '*.db' -print0 \
@@ -1904,19 +1899,19 @@
 	dh_testroot
 	umask 022
 
-	# Copy files placed by ooo-build/bin/package-ooo	
+	# Copy files placed by ooo-build/bin/package-ooo
 	for i in base calc core draw impress math writer gnome dev; do \
 	  rm -rf $(PKGDIR)-$$i $(PKGDIR)-$$i.*.debhelper ;\
 	  cp -r --preserve=mode debian/tmp/pkg/openoffice.org-$$i $(PKGDIR)-$$i || exit 1;\
 	done
 ifeq "$(BUILD_KDE)" "y"
-	  rm -rf $(PKGDIR)-kde $(PKGDIR)-kde.*.debhelper
-	  cp -r --preserve=mode debian/tmp/pkg/openoffice.org-kde $(PKGDIR)-kde || exit 1
+	rm -rf $(PKGDIR)-kde $(PKGDIR)-kde.*.debhelper
+	cp -r --preserve=mode debian/tmp/pkg/openoffice.org-kde $(PKGDIR)-kde || exit 1
 endif
 
 ifeq "$(BUILD_BINFILTERS)" "y"
-	  rm -rf $(PKGDIR)-filter-binfilter $(PKGDIR)-filter-binfilter.*.debhelper
-	  cp -r --preserve=mode debian/tmp/pkg/openoffice.org-filter-binfilter $(PKGDIR)-filter-binfilter || exit 1
+	rm -rf $(PKGDIR)-filter-binfilter $(PKGDIR)-filter-binfilter.*.debhelper
+	cp -r --preserve=mode debian/tmp/pkg/openoffice.org-filter-binfilter $(PKGDIR)-filter-binfilter || exit 1
 endif
 
 	rm -rf debian/ure debian/ure.*.debhelper ;\
@@ -2189,7 +2184,7 @@
 	done
 
 ifeq "$(BUILD_PYUNO)" "y"
-	# PyUNO packging
+	# PyUNO packaging
 	rm -rf debian/python-uno debian/python-uno.*.debhelper
 	cp -r --preserve=mode debian/tmp/pkg/python-uno debian/python-uno
 
@@ -2909,6 +2904,7 @@
 		fi ;\
 	done
 
+ifeq "$(DIST)" "Debian"
 	# fix intro
 	if dpkg-parsechangelog | grep urgency | grep -q "\~.*m[0123456789]\+"; then \
 		debian/scripts/fix_image_rgb \
@@ -2919,6 +2915,7 @@
 			$(SOURCE_TREE)/ooo_custom_images/nologo/introabout/intro.bmp \
 			$(PKGDIR)-common/$(OOBRANDDIR)/program/intro.bmp; \
 	fi
+endif
 
 	# fix permission
 	chmod 644 $(PKGDIR)-common/$(OODIR)/program/gengalrc
@@ -2935,7 +2932,7 @@
 	  rm -rf debian/$$pkg/DEBIAN;\
 	done
 
-	dh_installdocs -A -Nlibmythes-dev debian/README.Debian \
+	dh_installdocs -s -A -Nlibmythes-dev debian/README.Debian \
 		debian/tmp/pkg/openoffice.org-common/$(OOBRANDDIR)/README
 	dh_installdocs -plibmythes-dev debian/copyright
 	dh_installman -s
@@ -3100,7 +3097,7 @@
 		-V"ure:Version=$(shell grep -A 1 "PRODUCTNAME URE" $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print $$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`" \
 		-v$(shell grep -A 1 "PRODUCTNAME URE" $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print $$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
 	dh_md5sums -s
-	dh_builddeb -s $(DEBHELPER_OPTIONS)
+	dh_builddeb -s $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
 
 	touch $@
 
@@ -3150,7 +3147,7 @@
 	# But fix it..
 	perl -pi -e 's,html/,html /,g' debian/openoffice.org-dev-doc.doc-base.udk-common-ref
 endif
-	dh_installdocs -A  debian/README.Debian \
+	dh_installdocs -i -A debian/README.Debian \
 		debian/tmp/pkg/openoffice.org-common/$(OOBRANDDIR)/README
 ifeq "$(PACKAGE_PCVSLIB)" "y"
 	dh_installexamples -plibpcvslib-perl \
@@ -3223,7 +3220,7 @@
 		-v0.02+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
 endif
 	dh_md5sums -i
-	dh_builddeb -i $(DEBHELPER_OPTIONS)
+	dh_builddeb -i $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
 
 	touch $@
 
@@ -3236,9 +3233,13 @@
 
 # FIXME: works for milestones only...
 get-orig-source:
-	if test -n "$$TMP"; then TMPD=`mktemp -d -p $$TMP`; else \
-		TMPD=`mktemp -d`; fi && \
-	cd $$TMPD && mkdir -p openoffice.org-$(UPSTREAM_VERSION)/ooo-build/src && \
+	if test -n "$$TMP"; then \
+		TMPD=`mktemp -d -p $$TMP`; \
+	else \
+		TMPD=`mktemp -d`; \
+	fi && \
+	cd $$TMPD && \
+	mkdir -p openoffice.org-$(UPSTREAM_VERSION)/ooo-build/src && \
 	cd openoffice.org-$(UPSTREAM_VERSION)/ooo-build/src && \
 		wget http://download.go-oo.org/$(MWS)/$(TAG)-artwork.tar.bz2 && \
 		wget http://download.go-oo.org/$(MWS)/$(TAG)-base.tar.bz2 && \
@@ -3259,20 +3260,26 @@
 		wget http://download.go-oo.org/$(MWS)/$(TAG)-writer.tar.bz2 && \
 		wget http://download.go-oo.org/$(MWS)/$(TAG)-swext.tar.bz2 && \
 		tar xfvj $(TAG)-libs_extern.tar.bz2 && \
-			rm -rf $(TAG)-libs_extern/external/jars && \
-		tar cfvj $(TAG)-libs_extern.tar.bz2.dfsg $(TAG)-libs_extern && ln -sf $(TAG)-libs_extern.tar.bz2.dfsg $(TAG)-libs_extern.tar.bz2 && rm -rf $(TAG)-libs_extern && \
+		rm -rf $(TAG)-libs_extern/external/jars && \
+		tar cfvj $(TAG)-libs_extern.tar.bz2.dfsg $(TAG)-libs_extern && \
+		ln -sf $(TAG)-libs_extern.tar.bz2.dfsg $(TAG)-libs_extern.tar.bz2 && \
+		rm -rf $(TAG)-libs_extern && \
 		tar xfvj $(TAG)-libs_extern_sys.tar.bz2 && \
-			rm -rf $(TAG)-libs_extern_sys/xalan && \
-			for i in da_DK en_GB nl_NL ru_RU; do \
-				rm $(TAG)-libs_extern_sys/dictionaries/$$i/hyph_$${i}.dic; \
+		rm -rf $(TAG)-libs_extern_sys/xalan && \
+		for i in da_DK en_GB nl_NL ru_RU; do \
+			rm $(TAG)-libs_extern_sys/dictionaries/$$i/hyph_$${i}.dic; \
 		done && \
 		rm $(TAG)-libs_extern_sys/bitstream_vera_fonts/download/liberation-fonts.zip && \
-		tar cfvj $(TAG)-libs_extern_sys.tar.bz2.dfsg $(TAG)-libs_extern_sys && ln -sf $(TAG)-libs_extern_sys.tar.bz2.dfsg $(TAG)-libs_extern_sys.tar.bz2 && rm -rf $(TAG)-libs_extern_sys && \
+		tar cfvj $(TAG)-libs_extern_sys.tar.bz2.dfsg $(TAG)-libs_extern_sys && \
+		ln -sf $(TAG)-libs_extern_sys.tar.bz2.dfsg $(TAG)-libs_extern_sys.tar.bz2 && \
+		rm -rf $(TAG)-libs_extern_sys && \
 		tar xfvj $(TAG)-libs_gui.tar.bz2 && \
 		for i in `find $(TAG)-libs_gui/psprint_config/configuration/ppds ! -name "SGEN*" -name "*.PS"`; do \
 			rm $$i; \
 		done && \
-		tar cfvj $(TAG)-libs_gui.tar.bz2.dfsg $(TAG)-libs_gui && ln -sf $(TAG)-libs_gui.tar.bz2.dfsg $(TAG)-libs_gui.tar.bz2 && rm -rf $(TAG)-libs_gui && \
+		tar cfvj $(TAG)-libs_gui.tar.bz2.dfsg $(TAG)-libs_gui && \
+		ln -sf $(TAG)-libs_gui.tar.bz2.dfsg $(TAG)-libs_gui.tar.bz2 && \
+		rm -rf $(TAG)-libs_gui && \
 		cd $$TMPD && tar cfvz openoffice.org_$(UPSTREAM_VERSION).orig.tar.gz openoffice.org-$(UPSTREAM_VERSION) && \
 		rm -rf openoffice.org-$(UPSTREAM_VERSION) && \
 		mv  openoffice.org_$(UPSTREAM_VERSION).orig.tar.gz $(CURDIR)/..

Reply to:

Prev by Date: ./packages/openofficeorg/3.0/experimental r1203: update mono install and reenable the mono packages
Next by Date: ./packages/openofficeorg/3.0/experimental r1205: ooo-build now already installs /cli_uno_bridge.dll.config into the URE dir
Previous by thread: ./packages/openofficeorg/3.0/experimental r1203: update mono install and reenable the mono packages
Next by thread: ./packages/openofficeorg/3.0/experimental r1205: ooo-build now already installs /cli_uno_bridge.dll.config into the URE dir
Index(es):
- Date
- Thread