------------------------------------------------------------
revno: 808
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2007-10-19 20:15:34 +0200
message:
get rid of Autodoc_DiagnosticMessages.txt completely (merge from 2.3)
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-10-19 17:38:59 +0000
+++ b/changelog 2007-10-19 18:15:34 +0000
@@ -20,6 +20,7 @@
+ added mono-jit-dbg and mono-dbg to suggest list for debug packages
+ build-depend on lib32icu36 on amd64 when using ICU 3.6 to work around
#447275
+ + get rid of Autodoc_DiagnosticMessages.txt completely
- debian/control.in:
+ remove long obsolete debconf depends; we don't use debconf anymore
- debian/control.mono.in:
@@ -34,7 +35,7 @@
- debian/control.in: Build openoffice.org-officebean only on architectures
with java support
- -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 19 Oct 2007 19:37:30 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 19 Oct 2007 20:13:52 +0200
openoffice.org (2.2.1-9) unstable; urgency=high
=== modified file 'rules'
--- a/rules 2007-10-19 17:38:59 +0000
+++ b/rules 2007-10-19 18:15:34 +0000
@@ -2517,7 +2517,10 @@
-e "s/@UDK_MICRO@/$$UDK_MICRO/" \
-e "s/@VER@/$(VER)/" \
> debian/openoffice.org-dev-doc.doc-base.udk-$$i-ref; \
- done
+ done
+ # remove Autodoc_DiagnosticMessages.txt
+ find $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev \
+ -name "Autodoc_DiagnosticMessages.txt" -exec rm {} \;
UDK_CPP_FILES=`find
$(CURDIR)/debian/openoffice.org-dev-doc/usr/share/doc/openoffice.org-dev/docs/cpp/ref
| sed -e 's,$(CURDIR)/debian/openoffice.org-dev-doc,,g' | xargs`; \
echo "Files: $$UDK_CPP_FILES" >>
debian/openoffice.org-dev-doc.doc-base.udk-cpp-ref; \
UDK_JAVA_FILES=`find
$(CURDIR)/debian/openoffice.org-dev-doc/usr/share/doc/openoffice.org-dev/docs/java/ref
| sed -e 's,$(CURDIR)/debian/openoffice.org-dev-doc,,g' | xargs`; \
@@ -2532,10 +2535,6 @@
# since it doesn't affect the files at the end of the lines...
# But fix it..
perl -pi -e 's,html/,html /,g'
debian/openoffice.org-dev-doc.doc-base.udk-common-ref
- # remove Autodoc_DiagnosticMessages.txt from doc-base files
- for i in common cpp; do \
- perl -pi -e
"s,/usr/share/doc/openoffice.org-dev/docs/$$i/ref/Autodoc_DiagnosticMessages.txt
,," debian/openoffice.org-dev-doc.doc-base.udk-$$i-ref; \
- done
endif
dh_installdocs -A debian/README.Debian
debian/tmp/pkg/openoffice.org-common/$(OODIR)/README
dh_installman -i
