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

./packages/openofficeorg/3.1.1/unstable r1755: the mono stuff is also in /usr/lib/openoffice/ure, move rm after the mono install



------------------------------------------------------------
revno: 1755
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Fri 2009-11-13 19:22:41 +0100
message:
  the mono stuff is also in /usr/lib/openoffice/ure, move rm after the mono install
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2009-11-13 16:31:08 +0000
+++ b/changelog	2009-11-13 18:22:41 +0000
@@ -25,7 +25,7 @@
   * debian/openoffice.org-common.lintian-overrides.in: override
     E: openoffice.org-common: no-debconf-config
 
- -- Rene Engelhard <rene@debian.org>  Fri, 13 Nov 2009 17:28:45 +0100
+ -- Rene Engelhard <rene@debian.org>  Fri, 13 Nov 2009 19:21:47 +0100
 
 openoffice.org (1:3.1.1-6) unstable; urgency=low
 

=== modified file 'rules'
--- a/rules	2009-11-12 18:39:36 +0000
+++ b/rules	2009-11-13 18:22:41 +0000
@@ -2147,7 +2147,6 @@
 		mv $$i debian/uno-libs3/$(OOUREDIR)/lib; \
 		ln -sf /$(OOUREDIR)/lib/`basename $$i` debian/uno-libs3/usr/lib/`basename $$i`; \
 	done
-	rm -rf $(PKGDIR)-core/$(OOBRANDDIR)/ure
 
 ifeq "$(BUILD_KDE)" "y"
 	mkdir -p -m755 $(PKGDIR)-kde/$(OODIR)/program
@@ -2425,6 +2424,9 @@
 		> debian/cli-uno-bridge/usr/lib/pkgconfig/mono-$(OODIRNAME).pc
 endif
 
+	# should be empty, now, remove
+	rmdir $(PKGDIR)-core/$(OOBRANDDIR)/ure
+
 ifeq "$(PACKAGE_SDK)" "y"
   ifeq "$(USE_SYSTEM_STLPORT)" "y"
 	# when we use external stlport, we just can and should do a symlink


Reply to: