------------------------------------------------------------ revno: 2081 committer: Rene Engelhard <[email protected]> branch nick: debian timestamp: Wed 2010-10-13 15:22:03 +0200 message: merge some hopefully approvable fixes from 3.3 branch renamed: catalog.xml => catalog.xml.in modified: changelog rules udk-common-ref.in udk-cpp-ref.in udk-java-ref.in xmerge-javadoc.in catalog.xml.in
=== renamed file 'catalog.xml' => 'catalog.xml.in' --- a/catalog.xml 2005-11-21 21:04:07 +0000 +++ b/catalog.xml.in 2010-10-13 13:22:03 +0000 @@ -2,5 +2,5 @@ <!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN" "file:///usr/share/xml/schema/xml-core/catalog.dtd"> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> -<public publicId="-//OpenOffice.org//DTD OfficeDocument 1.0//EN" uri="/usr/lib/openoffice/share/dtd/officedocument/1_0/office.dtd"/> +<public publicId="-//OpenOffice.org//DTD OfficeDocument 1.0//EN" uri="/@OOBASISDIR@/share/dtd/officedocument/1_0/office.dtd"/> </catalog>
=== modified file 'changelog' --- a/changelog 2010-09-26 16:18:23 +0000 +++ b/changelog 2010-10-13 13:22:03 +0000 @@ -1,3 +1,11 @@ +openoffice.org (1:3.2.1-8) UNRELEASED; urgency=low + + * debian/catalog.xml: move ... + * debian/catalog.xml.in: ... here and fix path to dtd + * debian/udk*in, debian/xmerge-javadoc.in: Sun Microsystems, Inc -> Oracle + + -- Rene Engelhard <[email protected]> Wed, 22 Sep 2010 17:58:25 +0200 + openoffice.org (1:3.2.1-7) unstable; urgency=low * debian/patches/add-some-missing-german-translations.diff: as named, === modified file 'rules' --- a/rules 2010-08-24 11:38:08 +0000 +++ b/rules 2010-10-13 13:22:03 +0000 @@ -1612,6 +1612,7 @@ rm -f debian/openoffice.org-$$i.lintian-overrides; \ done rm -f debian/*.install debian/*.dirs + rm -f debian/catalog.xml rm -f debian/openoffice.org-dtd-officedocument1.0.xmlcatalogs rm -f download.list @@ -3394,7 +3395,9 @@ mkdir -p $(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd mv $(PKGDIR)-common/$(OODIR)/share/dtd/officedocument \ $(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd - cp debian/catalog.xml $(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd/officedocument/1_0 + cat debian/catalog.xml.in \ + | sed -e "s,\...@oobasisdir\@,$(OOBASISDIR)," \ + > $(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd/officedocument/1_0/catalog.xml cat $(PKGDIR)-dtd-officedocument1.0.xmlcatalogs.in \ | sed -e "s,\...@oobasisdir\@,$(OOBASISDIR)," \ > $(PKGDIR)-dtd-officedocument1.0.xmlcatalogs === modified file 'udk-common-ref.in' --- a/udk-common-ref.in 2008-03-08 22:07:34 +0000 +++ b/udk-common-ref.in 2010-10-13 13:22:03 +0000 @@ -1,6 +1,6 @@ Document: udk-common-ref Title: UDK @udk_ma...@.@udk_mi...@.@UDK_MICRO@ IDL Reference -Author: Sun Microsystems, Inc. +Author: Oracle Section: Programming Format: HTML === modified file 'udk-cpp-ref.in' --- a/udk-cpp-ref.in 2008-03-08 22:07:34 +0000 +++ b/udk-cpp-ref.in 2010-10-13 13:22:03 +0000 @@ -1,6 +1,6 @@ Document: udk-cpp-ref Title: UDK @udk_ma...@.@udk_mi...@.@UDK_MICRO@ C/C++ API Reference -Author: Sun Microsystems, Inc. +Author: Oracle Section: Programming Format: HTML === modified file 'udk-java-ref.in' --- a/udk-java-ref.in 2008-03-08 22:07:34 +0000 +++ b/udk-java-ref.in 2010-10-13 13:22:03 +0000 @@ -1,6 +1,6 @@ Document: udk-java-ref Title: UDK @udk_ma...@.@udk_mi...@.@UDK_MICRO@ Java API Reference -Author: Sun Microsystems, Inc. +Author: Oracle Section: Programming Format: HTML === modified file 'xmerge-javadoc.in' --- a/xmerge-javadoc.in 2007-06-28 10:29:35 +0000 +++ b/xmerge-javadoc.in 2010-10-13 13:22:03 +0000 @@ -1,6 +1,6 @@ Document: xmerge-javadoc Title: OpenOffice.org XMerge API Javadoc -Author: Sun Microsystems, Inc. +Author: Oracle Section: Apps/Programming Format: HTML
