./packages/openofficeorg/3.1.1/unstable r1833: check whether .install/.dirs exist before trying to lowercase them (merge from 3.2)

[Rene Engelhard]

------------------------------------------------------------
revno: 1833
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2010-01-27 18:36:48 +0100
message:
  check whether .install/.dirs exist before trying to lowercase them (merge 
from 3.2)
modified:
  changelog
  rules

=== modified file 'changelog'
--- a/changelog 2010-01-26 23:35:16 +0000
+++ b/changelog 2010-01-27 17:36:48 +0000
@@ -10,13 +10,14 @@
       dh_md5sums
     - build without VERBOSE=true (normal) mode on all buildds now in a try
       to mitigate buildd log size
+    - 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
   * debian/openoffice.org-common.tenplates,in, debian/rules, debian/po*: Move
     debconf template to shared/openofficeorg-running (see #566644); Unfuzzy.
 
- -- Rene Engelhard <r...@debian.org>  Wed, 27 Jan 2010 00:35:10 +0100
+ -- Rene Engelhard <r...@debian.org>  Wed, 27 Jan 2010 18:36:03 +0100
 
 openoffice.org (1:3.1.1-14) unstable; urgency=medium
 

=== modified file 'rules'
--- a/rules     2010-01-25 21:16:09 +0000
+++ b/rules     2010-01-27 17:36:48 +0000
@@ -1848,16 +1848,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-$$iso.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