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

./packages/openofficeorg/3.2/experimental r1771: check actual existance of help dirs (debian/oo.o-help-xx/usr) to work around build failure on the buildds



------------------------------------------------------------
revno: 1771
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Thu 2010-01-21 09:37:32 +0100
message:
  check actual existance of help dirs (debian/oo.o-help-xx/usr) to work around build failure on the buildds
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2010-01-20 23:44:09 +0000
+++ b/changelog	2010-01-21 08:37:32 +0000
@@ -9,11 +9,13 @@
       dh_md5sums
     - build without VERBOSE=true (normal) mode on all buildds now in a try
       to mitigate buildd log size
+    - check actual existance of help dirs (debian/oo.o-help-xx/usr) to work
+      around build failure on the buildds (which build only english)
   * debian/shell-lib-{extensions,components}.sh: add echos instead of debconf
     message on DEBIAN_FRONTEND = noninteractive so that people in that case also
     know what goes on
 
- -- Rene Engelhard <rene@debian.org>  Wed, 20 Jan 2010 20:41:36 +0100
+ -- Rene Engelhard <rene@debian.org>  Thu, 21 Jan 2010 09:35:49 +0100
 
 openoffice.org (1:3.2.0~rc3-1) experimental; urgency=low
 

=== modified file 'rules'
--- a/rules	2010-01-20 23:44:09 +0000
+++ b/rules	2010-01-21 08:37:32 +0000
@@ -1943,8 +1943,10 @@
 	# move help to /usr/share
 	for iso in $(HELPISOS); do \
 		pkgiso=`echo $$iso | tr A-Z a-z`; \
-		mv $(PKGDIR)-help-$$pkgiso/usr/lib \
-			$(PKGDIR)-help-$$pkgiso/usr/share; \
+		if [ -e $(PKGDIR)-help-$$pkgiso/usr ]; then \
+			mv $(PKGDIR)-help-$$pkgiso/usr/lib \
+				$(PKGDIR)-help-$$pkgiso/usr/share; \
+		fi; \
 	done
 
 ifeq "$(ENABLE_JAVA)" "y"


Reply to: