------------------------------------------------------------
revno: 1779
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Tue 2010-01-26 16:52:19 +0100
message:
  also add if -e checks for lowercasing of l10ns
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog 2010-01-26 14:06:37 +0000
+++ b/changelog 2010-01-26 15:52:19 +0000
@@ -13,7 +13,8 @@
     - 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)
+      around build failure on the buildds (which build only english); also
+      check whether .install/.dirs exist before trying to lowercase them
   * 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
@@ -22,7 +23,7 @@
   * debian/control.presenter.in: depend on (our) OOo 3.2
   * debian/control.in: Breaks: openoffice.org-presenter-console (<< 1.0.3~) 
 
- -- Rene Engelhard <[email protected]>  Tue, 26 Jan 2010 15:04:41 +0100
+ -- Rene Engelhard <[email protected]>  Tue, 26 Jan 2010 16:51:33 +0100
 
 openoffice.org (1:3.2.0~rc3-1) experimental; urgency=low
 

=== modified file 'rules'
--- a/rules     2010-01-26 09:40:37 +0000
+++ b/rules     2010-01-26 15:52:19 +0000
@@ -1899,16 +1899,21 @@
        for iso in $(ISOS); do \
                pkgiso=`echo $$iso | tr A-Z a-z`; \
                if [ "$$iso" != "$$pkgiso" ]; then \
-                       if [ "$$iso" != "en-US" ]; then \
+                       if [ "$$iso" != "en-US" -a \
+                         -e debian/openoffice.org-l10n-$$iso.dirs -a \
+                         -e debian/openoffice.org-l10n-$$iso.install ]; then \
                                mv debian/openoffice.org-l10n-$$iso.dirs \
                                        
debian/openoffice.org-l10n-$$pkgiso.dirs; \
                                mv debian/openoffice.org-l10n-$$iso.install \
                                        
debian/openoffice.org-l10n-$$pkgiso.install; \
                        fi; \
-                       mv debian/openoffice.org-help-$$iso.dirs \
-                               debian/openoffice.org-help-$$pkgiso.dirs; \
-                       mv debian/openoffice.org-help-$$iso.install \
-                               debian/openoffice.org-help-$$pkgiso.install; \
+                       if [ -e debian/openoffice.org-help-$$iso.dirs -a \
+                         -e debian/openoffice.org-help-$$pkgiso.install ]; then
+                               mv debian/openoffice.org-help-$$iso.dirs \
+                                       
debian/openoffice.org-help-$$pkgiso.dirs; \
+                               mv debian/openoffice.org-help-$$iso.install \
+                                       
debian/openoffice.org-help-$$pkgiso.install; \
+                       fi; \
                fi; \
        done
 

Reply via email to