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

./packages/openofficeorg/3.2/experimental r1648: update .xmlcatalogs; make generated file adapting automatically to new basisX.Y



------------------------------------------------------------
revno: 1648
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-09-10 21:15:58 +0200
message:
  update .xmlcatalogs; make generated file adapting automatically to new basisX.Y
renamed:
  openoffice.org-dtd-officedocument1.0.xmlcatalogs => openoffice.org-dtd-officedocument1.0.xmlcatalogs.in
modified:
  rules
  openoffice.org-dtd-officedocument1.0.xmlcatalogs.in
=== renamed file 'openoffice.org-dtd-officedocument1.0.xmlcatalogs' => 'openoffice.org-dtd-officedocument1.0.xmlcatalogs.in'
--- a/openoffice.org-dtd-officedocument1.0.xmlcatalogs	2008-12-07 17:47:27 +0000
+++ b/openoffice.org-dtd-officedocument1.0.xmlcatalogs.in	2009-09-10 19:15:58 +0000
@@ -1,2 +1,2 @@
-local;debian/openoffice.org-dtd-officedocument1.0/usr/lib/openoffice/basis3.1/share/dtd/officedocument/1_0/catalog.xml;/usr/share/xml/openoffice.org-dtd-officedocument1.0/catalog.xml
+local;debian/openoffice.org-dtd-officedocument1.0/@OOBASISDIR@/share/dtd/officedocument/1_0/catalog.xml;/usr/share/xml/openoffice.org-dtd-officedocument1.0/catalog.xml
 root-and-package;public;-//OpenOffice.org//DTD OfficeDocument 1.0//EN;/usr/share/xml/openoffice.org-dtd-officedocument1.0/catalog.xml

=== modified file 'rules'
--- a/rules	2009-09-10 16:50:45 +0000
+++ b/rules	2009-09-10 19:15:58 +0000
@@ -1315,6 +1315,7 @@
 		rm -f debian/openoffice.org-$$i.lintian-overrides; \
 	done
 	rm -f debian/*.install debian/*.dirs
+	rm -f debian/openoffice.org-dtd-officedocument1.0.xmlcatalogs
 	rm -f download.list
 
 	$(MAKE) -f debian/rules control
@@ -2963,6 +2964,9 @@
 	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 $(PKGDIR)-dtd-officedocument1.0.xmlcatalogs.in \
+		| sed -e "s,\@OOBASISDIR\@,$(OOBASISDIR)," \
+		> $(PKGDIR)-dtd-officedocument1.0.xmlcatalogs
 
 	# add "openoffice.org" symlink
 	cd $(PKGDIR)-common/usr/bin && ln -s ooffice openoffice.org$(VER)


Reply to: