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

./packages/openofficeorg/3.0.1/experimental r1366: fix extra license/readme file removal



------------------------------------------------------------
revno: 1366
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2009-01-07 02:54:22 +0100
message:
  fix extra license/readme file removal
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2009-01-07 01:37:19 +0000
+++ b/changelog	2009-01-07 01:54:22 +0000
@@ -6,6 +6,7 @@
     - apply Python26 patchset if building with python 2.6 
     - install libsalalloc_malloc.so.3 into -qa-tools
     - remove rest of if(n)eq ETCH_BACKPORT conditionals
+    - fix extra license/readme file removal
   * debian/control.reportdesign.in:
     - add missing Depends: on ${java-runtime-depends}
   * debian/control.in:
@@ -19,7 +20,7 @@
   * debian/presubj: point to OpenOffice.orgs README sections
     ("Problems During Program Startup" and "File Locking"). 
 
- -- Rene Engelhard <rene@debian.org>  Wed, 07 Jan 2009 02:35:43 +0100
+ -- Rene Engelhard <rene@debian.org>  Wed, 07 Jan 2009 02:53:42 +0100
 
 openoffice.org (1:3.0.1~rc1-2) experimental; urgency=low
 

=== modified file 'rules'
--- a/rules	2009-01-07 00:06:22 +0000
+++ b/rules	2009-01-07 01:54:22 +0000
@@ -2784,14 +2784,16 @@
   endif
 endif
 	# remove extra license files
-	rm -rf $(PKGDIR)-commmon/$(OOBRANDDIR)/licenses
+	rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/licenses
 	rm -f $(PKGDIR)-common/$(OOBRANDDIR)/share/readme/LICENSE*
 	rm -f $(PKGDIR)-common/$(OOBRANDDIR)/THIRDPARTYLICENSEREADME.html
-	rm -f $(PKGDIR)-common/$(OOBRANDIR)/LICENSE.html
+	rm -f $(PKGDIR)-common/$(OOBRANDDIR)/LICENSE.html
 
 	# remove extra readme files
 	rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/readmes
 	rm -f $(PKGDIR)-common/$(OOBRANDDIR)/share/readme/README*
+	rm -f $(PKGDIR)-common/$(OOBRANDDIR)/README.html
+	rm -f $(PKGDIR)-common/$(OOBRANDDIR)/README
 
 	# install ooo-build desktop icons
 	for r in 16x16 22x22 24x24 32x32 48x48; do \


Reply to: