------------------------------------------------------------
revno: 2310
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Sat 2011-01-08 19:14:04 +0100
message:
more -dtd-officedocument1.0 fixes: correct symlink (there's also a real dtd
dir containg math, properly version 1.0
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2011-01-08 16:45:41 +0000
+++ b/changelog 2011-01-08 18:14:04 +0000
@@ -15,7 +15,8 @@
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 and .xmlcatalogs.in itself
- ("/OpenOffice.org//DTD OfficeDocument 1.0")
+ ("/OpenOffice.org//DTD OfficeDocument 1.0"). Make package properly
+ versioned.
* debian/source/local-options: abort-on-upstream-changes
* debian/rules, debian/*.manpages, debian/README.Debian: update for
oo* -> lo*/libreoffice
@@ -25,7 +26,7 @@
but lo*.
- actually add Replaces: on openoffice.org-common (closes: #602867)
- -- Rene Engelhard <[email protected]> Sat, 08 Jan 2011 16:32:29 +0100
+ -- Rene Engelhard <[email protected]> Sat, 08 Jan 2011 19:05:47 +0100
libreoffice (1:3.3.0~rc2-3) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2011-01-08 16:45:41 +0000
+++ b/rules 2011-01-08 18:14:04 +0000
@@ -3018,8 +3018,8 @@
> debian/openoffice.org-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
+ mkdir -p $(OODIR)/share/dtd && \
+ cd $(OODIR)/share/dtd && ln -s /$(shell echo $(OODIR) | sed -e
s/libreoffice/openoffice/)/share/dtd/officedocument
ifeq "$(DIST)" "Debian"
# install Debian presentation template
@@ -3489,6 +3489,8 @@
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep
"<version" $(SOURCE_TREE)/reportbuilder/$(shell . $(SOURCE_TREE)/*Env*.sh; echo
$$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version
value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
+ dh_gencontrol -popenoffice.org-dtd-officedocument1.0 -- \
+ -v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 |
bc):1.0+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
dh_md5sums -i -Xjavasettingsunopkginstall.xml
dh_builddeb -i $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
