./packages/openofficeorg/3.3.0/experimental r2120: + * debian/catalog.xml: move ...
------------------------------------------------------------
revno: 2120
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2010-10-12 23:44:43 +0200
message:
+ * debian/catalog.xml: move ...
+ * debian/catalog.xml.in: ... here and fix path to dtd
renamed:
catalog.xml => catalog.xml.in
modified:
changelog
rules
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-12 21:44:43 +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-10-04 17:45:31 +0000
+++ b/changelog 2010-10-12 21:44:43 +0000
@@ -55,6 +55,8 @@
installed/updated
* debian/control.in, debian/rules: stop building industrial package
* debian/scripts/fix_bmp_rgb: remove
+ * debian/catalog.xml: move ...
+ * debian/catalog.xml.in: ... here and fix path to dtd
-- Rene Engelhard <rene@debian.org> Mon, 04 Oct 2010 16:56:49 +0200
=== modified file 'rules'
--- a/rules 2010-10-04 17:45:31 +0000
+++ b/rules 2010-10-12 21:44:43 +0000
@@ -1625,6 +1625,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
@@ -3393,7 +3394,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
Reply to: