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

./packages/openofficeorg/3.1.1/unstable r1761: - fix usr/lib/openoffice/ure removal to not fail if the dir does



------------------------------------------------------------
revno: 1761
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Mon 2009-11-16 10:28:43 +0100
message:
      - fix usr/lib/openoffice/ure removal to not fail if the dir does
        not exist anymore (e.g. on the non-mono archs)
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2009-11-16 09:20:14 +0000
+++ b/changelog	2009-11-16 09:28:43 +0000
@@ -4,6 +4,8 @@
     - fix typo: s/endianess/endianness
   * debian/rules:
     - just build-depend on libgcj-common (>= 1:4.4.1)
+    - fix usr/lib/openoffice/ure removal to not fail if the dir does
+      not exist anymore (e.g. on the non-mono archs)
   * debian/control.in:
     - fix Vcs-Bzr:
 

=== modified file 'rules'
--- a/rules	2009-11-16 09:19:18 +0000
+++ b/rules	2009-11-16 09:28:43 +0000
@@ -2424,9 +2424,8 @@
 		> debian/cli-uno-bridge/usr/lib/pkgconfig/mono-$(OODIRNAME).pc
 endif
 
-	# should be empty now, remove
-	rmdir $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib
-	rmdir $(PKGDIR)-core/$(OOBRANDDIR)/ure
+	# should be empty now, remove if there
+	rm -rf $(PKGDIR)-core/$(OOBRANDDIR)/ure
 
 ifeq "$(PACKAGE_SDK)" "y"
   ifeq "$(USE_SYSTEM_STLPORT)" "y"


Reply to: