The following commit has been merged in the debian-experimental-4.1 branch:
commit d31c0370aa19937242796f928101a0b5467c5e6f
Author: Rene Engelhard <[email protected]>
Date: Wed Mar 6 02:58:36 2013 +0100
fix API docs install; fix version info and use lo_sources_ver also for the
API docs as it's used there
diff --git a/lo-common-ref.in b/lo-common-ref.in
new file mode 100644
index 0000000..fbf9494
--- /dev/null
+++ b/lo-common-ref.in
@@ -0,0 +1,7 @@
+Document: lo-common-ref
+Title: LibreOffice @lo_sources_ver@ IDL Reference
+Author: The Document Foundation
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libreoffice-dev/docs/common/ref/module-ix.html
diff --git a/lo-cpp-ref.in b/lo-cpp-ref.in
new file mode 100644
index 0000000..429c57a
--- /dev/null
+++ b/lo-cpp-ref.in
@@ -0,0 +1,7 @@
+Document: lo-cpp-ref
+Title: LibreOffice @lo_sources_ver@ SDK C/C++ API Reference
+Author: The Document Foundation
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libreoffice-dev/docs/cpp/ref/index.html
diff --git a/lo-java-ref.in b/lo-java-ref.in
new file mode 100644
index 0000000..e1e00b2
--- /dev/null
+++ b/lo-java-ref.in
@@ -0,0 +1,7 @@
+Document: lo-java-ref
+Title: LibreOffice SDK @lo_sources_ver@ Java API Reference
+Author: The Document Foundation
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libreoffice-dev/docs/java/ref/index.html
diff --git a/rules b/rules
index 84fb215..4725315 100755
--- a/rules
+++ b/rules
@@ -65,15 +65,15 @@ SOURCE_TREE=.
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/src
export TARFILE_LOCATION
-USE_SOURCE_TARBALLS=y
+USE_SOURCE_TARBALLS=n
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=4.0.1.2
+lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep
documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
-GIT_TAG=libreoffice-$(lo_sources_ver)-hotfixes1
-GIT_BRANCH=libreoffice-4-0-1
+GIT_TAG=libreoffice-$(lo_sources_ver)
+GIT_BRANCH=master
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@ -3000,35 +3000,31 @@ endif
done
ifeq "$(PACKAGE_SDK)" "y"
- . $(SOURCE_TREE)/solenv/inc/udkversion.mk && \
for i in common cpp java; do \
- cat debian/udk-$$i-ref.in \
- | sed -e "s/@UDK_MAJOR@/$$UDK_MAJOR/" \
- -e "s/@UDK_MINOR@/$$UDK_MINOR/" \
- -e "s/@UDK_MICRO@/$$UDK_MICRO/" \
- -e "s/@VER@/$(VER)/" \
- > debian/libreoffice-dev-doc.doc-base.udk-$$i-ref; \
+ cat debian/lo-$$i-ref.in \
+ | sed -e "s/@lo_sources_ver@/$(lo_sources_ver)/" \
+ > debian/libreoffice-dev-doc.doc-base.lo-$$i-ref; \
done
# remove Autodoc_DiagnosticMessages.txt
find $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev \
-name "Autodoc_DiagnosticMessages.txt" -exec rm {} \;
UDK_CPP_FILES=`find
$(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice-dev/docs/cpp/ref
| sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
- echo "Files: $$UDK_CPP_FILES" >>
debian/libreoffice-dev-doc.doc-base.udk-cpp-ref
+ echo "Files: $$UDK_CPP_FILES" >>
debian/libreoffice-dev-doc.doc-base.lo-cpp-ref
ifeq "$(ENABLE_JAVA)" "y"
UDK_JAVA_FILES=`find
$(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice-dev/docs/java/ref
| sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
- echo "Files: $$UDK_JAVA_FILES" >>
debian/libreoffice-dev-doc.doc-base.udk-java-ref
+ echo "Files: $$UDK_JAVA_FILES" >>
debian/libreoffice-dev-doc.doc-base.lo-java-ref
endif
# xargs strips the many files here so we need to post-process it.
UDK_COMMON_FILES=`find
$(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice-dev/docs/common/ref
| sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
TMP=`mktemp -q`; \
- cp debian/libreoffice-dev-doc.doc-base.udk-common-ref $$TMP; \
+ cp debian/libreoffice-dev-doc.doc-base.lo-common-ref $$TMP; \
echo "Files: $$UDK_COMMON_FILES" >> $$TMP; \
- cat $$TMP | perl -e 'while(<>) { if (/^Files/) {$$f=1;} if ($$f eq "1")
{ chomp(); } print $$_; }' >
debian/libreoffice-dev-doc.doc-base.udk-common-ref; \
+ cat $$TMP | perl -e 'while(<>) { if (/^Files/) {$$f=1;} if ($$f eq "1")
{ chomp(); } print $$_; }' > debian/libreoffice-dev-doc.doc-base.lo-common-ref;
\
rm -f $$TMP
# no idea why this happens; afais this can't come from above
# since it doesn't affect the files at the end of the lines...
# But fix it..
- perl -pi -e 's,html/,html /,g'
debian/libreoffice-dev-doc.doc-base.udk-common-ref
+ perl -pi -e 's,html/,html /,g'
debian/libreoffice-dev-doc.doc-base.lo-common-ref
endif
dh_installdocs -i -A
for p in $(ARCH_INDEP_PACKAGES); do \
diff --git a/udk-common-ref.in b/udk-common-ref.in
deleted file mode 100644
index 5d6de88..0000000
--- a/udk-common-ref.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Document: udk-common-ref
-Title: UDK @UDK_MAJOR@.@UDK_MINOR@.@UDK_MICRO@ IDL Reference
-Author: Oracle
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libreoffice-dev/docs/common/ref/module-ix.html
diff --git a/udk-cpp-ref.in b/udk-cpp-ref.in
deleted file mode 100644
index 40a1b3f..0000000
--- a/udk-cpp-ref.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Document: udk-cpp-ref
-Title: UDK @UDK_MAJOR@.@UDK_MINOR@.@UDK_MICRO@ C/C++ API Reference
-Author: Oracle
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libreoffice-dev/docs/cpp/ref/index.html
diff --git a/udk-java-ref.in b/udk-java-ref.in
deleted file mode 100644
index 19e310d..0000000
--- a/udk-java-ref.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Document: udk-java-ref
-Title: UDK @UDK_MAJOR@.@UDK_MINOR@.@UDK_MICRO@ Java API Reference
-Author: Oracle
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libreoffice-dev/docs/java/ref/index.html
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
