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

r770 ./packages/openofficeorg/2.2.1/unstable: missing debian/; remove unneeded at mozilla-openoffice.org



------------------------------------------------------------
revno: 770
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2007-06-29 01:20:02 +0200
message:
  missing debian/; remove unneeded  at mozilla-openoffice.org
modified:
  changelog
  control
  control.mozilla.in
  rules
=== modified file 'changelog'
--- a/changelog	2007-06-28 14:12:42 +0000
+++ b/changelog	2007-06-28 23:20:02 +0000
@@ -20,8 +20,10 @@
   * debian/broffice.org*.in: add diversion for ooo-template.desktop
   * debian/openoffice.org-impress.mime: add pps
   * debian/openoffice.org.control.bug: fix thinko (s/base/core/)
+  * debian/control.mozilla.in: remove unneeded ${misc:Depends} at
+    mozilla-openoffice.org
 
- -- Rene Engelhard <rene@debian.org>  Thu, 28 Jun 2007 16:10:47 +0200
+ -- Rene Engelhard <rene@debian.org>  Fri, 29 Jun 2007 01:04:37 +0200
 
 openoffice.org (2.2.1-2) unstable; urgency=low
 

=== modified file 'control'
--- a/control	2007-06-28 09:42:00 +0000
+++ b/control	2007-06-28 23:20:02 +0000
@@ -3087,7 +3087,7 @@
  firefox,
  openoffice.org,
  openoffice.org-core
-Depends: ${shlibs:Depends}, ${misc:Depends}, openoffice.org-core (>= 2.2.0-2)
+Depends: ${shlibs:Depends}, openoffice.org-core (>= 2.2.0-2)
 Recommends: iceweasel | firefox | iceape-browser | mozilla-browser, openoffice.org-writer, openoffice.org-calc, openoffice.org-draw, openoffice.org-impress, openoffice.org-math, openoffice.org-base
 Description: OpenOffice.org Mozilla plugin
  OpenOffice.org is a full-featured office productivity suite that provides

=== modified file 'control.mozilla.in'
--- a/control.mozilla.in	2007-04-12 08:19:45 +0000
+++ b/control.mozilla.in	2007-06-28 23:20:02 +0000
@@ -8,7 +8,6 @@
  openoffice.orgVER,
  openoffice.orgVER-core
 Depends: ${shlibs:Depends},
- ${misc:Depends},
  openoffice.orgVER-core (>= 2.2.0-2)
 Recommends: iceweasel | firefox | iceape-browser | mozilla-browser,
  openoffice.org-writer,

=== modified file 'rules'
--- a/rules	2007-06-28 22:43:16 +0000
+++ b/rules	2007-06-28 23:20:02 +0000
@@ -2495,7 +2495,7 @@
 	# But fix it..
 	perl -pi -e 's,html/,html /,g' debian/openoffice.org-dev-doc.doc-base.udk-common-ref
 	XMERGE_FILES=`find $(CURDIR)/debian/openoffice.org-dev-doc/usr/share/doc/openoffice.org-dev/docs/xmerge | sed -e 's,$(CURDIR)/debian/openoffice.org-dev-doc,,g' | xargs`; \
-	cp xmerge-javadoc.in debian/openoffice.org-dev-doc.doc-base.xmerge-javadoc; \
+	cp debian/xmerge-javadoc.in debian/openoffice.org-dev-doc.doc-base.xmerge-javadoc; \
 	echo "Files: $$XMERGE_FILES" >> debian/openoffice.org-dev-doc.doc-base.xmerge-javadoc
 	# remove Autodoc_DiagnosticMessages.txt from doc-base files
 	for i in common cpp; do \


Reply to: