------------------------------------------------------------
revno: 2302
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Sun 2011-01-02 21:49:50 +0100
message:
rename libreoffice-dtd-officedocument1.0 back to
openoffice.org-dtd-officedocument1.0
renamed:
libreoffice-dtd-officedocument1.0.xmlcatalogs.in =>
openoffice.org-dtd-officedocument1.0.xmlcatalogs.in
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2011-01-02 17:50:44 +0000
+++ b/changelog 2011-01-02 20:49:50 +0000
@@ -5,6 +5,11 @@
- remove debian source package 1.0 format support, we don't
support stuff older than lenny anyways and lenny is able to
handle 3.0 (quilt)
+ * debian/control.in, debian/rules, *.xmlcatalogs.in: rename
+ libreoffice-dtd-officedocument1.0 back to
+ openoffice.org-dtd-officedocument1.0. It's OpenOffice.org 1.x' dtd,
+ so... Fix description to say OpenOffice.org 1.x instead of
+ LibreOffice 1.x
* debian/source/local-options: abort-on-upstream-changes
-- Rene Engelhard <[email protected]> Sun, 02 Jan 2011 17:03:05 +0100
=== modified file 'control'
--- a/control 2010-12-30 21:07:33 +0000
+++ b/control 2011-01-02 20:49:50 +0000
@@ -415,17 +415,20 @@
* PocketWord
* PocketExcel
-Package: libreoffice-dtd-officedocument1.0
+Package: openoffice.org-dtd-officedocument1.0
Section: text
Priority: extra
Depends: xml-core, ${misc:Depends}
Architecture: all
+Conflicts: libreoffice-dtd-officedocument1.0
+Provides: libreoffice-dtd-officedocument1.0
+Replaces: libreoffice-dtd-officedocument1.0
Description: office productivity suite -- legacy 1.0 XML DTD
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the Document Type Definition (DTD) of the
- LibreOffice 1.x(!) XML file format.
+ OpenOffice.org 1.x(!) XML file format.
Package: libreoffice-l10n-af
Section: localization
=== modified file 'control.in'
--- a/control.in 2010-12-30 20:26:12 +0000
+++ b/control.in 2011-01-02 20:49:50 +0000
@@ -571,16 +571,19 @@
* PocketWord
* PocketExcel
-Package: libreofficeVER-dtd-officedocument1.0
+Package: openoffice.org-dtd-officedocument1.0
Section: text
Priority: extra
Depends: xml-core,
${misc:Depends}
Architecture: all
+Conflicts: libreoffice-dtd-officedocument1.0
+Provides: libreoffice-dtd-officedocument1.0
+Replaces: libreoffice-dtd-officedocument1.0
Description: office productivity suite -- legacy 1.0 XML DTD
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the Document Type Definition (DTD) of the
- LibreOffice 1.x(!) XML file format.
+ OpenOffice.org 1.x(!) XML file format.
=== renamed file 'libreoffice-dtd-officedocument1.0.xmlcatalogs.in' =>
'openoffice.org-dtd-officedocument1.0.xmlcatalogs.in'
=== modified file 'rules'
--- a/rules 2011-01-02 17:48:21 +0000
+++ b/rules 2011-01-02 20:49:50 +0000
@@ -1311,7 +1311,7 @@
done
rm -f debian/*.install debian/*.dirs
rm -f debian/catalog.xml
- rm -f debian/libreoffice-dtd-officedocument1.0.xmlcatalogs
+ rm -f debian/openoffice.org-dtd-officedocument1.0.xmlcatalogs
rm -f download.list
rm -f $(OOO_BUILD_TREE)/src/libreoffice-$(OOO_BUILD_TARBAL_VERSION)*
@@ -2996,16 +2996,20 @@
# $(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e
s/lib/share/)/share/config/; \
# done
- rm -rf $(PKGDIR)-dtd-officedocument1.0
- mkdir -p $(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd
+ rm -rf debian/openoffice.org-dtd-officedocument1.0
+ mkdir -p debian/openoffice.org-dtd-officedocument1.0/$(shell echo
$(OODIR) | sed -e s/libreoffice/openoffice/)/share/dtd
mv $(PKGDIR)-common/$(OODIR)/share/dtd/officedocument \
- $(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd
+ debian/openoffice.org-dtd-officedocument1.0/$(shell echo
$(OODIR) | sed -e s/libreoffice/openoffice/)/share/dtd
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)," \
+ | sed -e "s,\...@oobasisdir\@,$(shell ehco $(OOBASISDIR) | -e
s/libreoffice/openoffice/)," \
+ > debian/openoffice.org-dtd-officedocument1.0/$(shell echo
$(OODIR) | sed -e
s/libreoffice/openoffice/)/share/dtd/officedocument/1_0/catalog.xml
+ cat debian/openoffice.org-dtd-officedocument1.0.xmlcatalogs.in \
+ | sed -e "s,\...@oobasisdir\@,$(shell ehco $(OOBASISDIR) | -e
s/libreoffice/openoffice/)," \
> $(PKGDIR)-dtd-officedocument1.0.xmlcatalogs
+ # symlink, as it's in a openoffice.org-* package
+ cd debian/openoffice.org-dtd-officedocument1.0 && \
+ mkdir -p $(OODIR)/share && \
+ cd $(OODIR)/share && ln -s /$(shell echo $(OODIR) | sed -e
s/libreoffice/openoffice/)/share/dtd
ifeq "$(DIST)" "Debian"
# install Debian presentation template
