This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 58750331c897a3ed312fd982834341e4bec391d7
Author: Rene Engelhard <r...@debian.org>
Date: Wed Apr 6 14:39:27 2016 +0200
move arch-indep SDK stuff into new -dev-common
---
changelog | 2 ++
control | 20 +++++++++++--
control.sdk.in | 20 +++++++++++--
rules | 95 ++++++++++++++++++++++++++++++++++++++--------------------
4 files changed, 99 insertions(+), 38 deletions(-)
diff --git a/changelog b/changelog
index e85c394..bcd9531 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,8 @@ libreoffice (1:5.2.0~alpha1~git20160329-1) UNRELEASED;
urgency=medium
libreofficekit-data
* debian/rules, debian/control.in, debian/libreoffice-gtk.*: rename -gtk
to -gtk2
+ * debian/control.sdk.in, debian/rules: move arch-indep SDK stuff into new
+ -dev-common
* debian/uno-libs3.symbols: update
-- Rene Engelhard <r...@debian.org> Thu, 26 Nov 2015 10:37:57 +0100
diff --git a/control b/control
index 62a8b8f..cc9c8ae 100644
--- a/control
+++ b/control
@@ -4365,6 +4365,7 @@ Section: devel
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el
s390 s390x sparc
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-core (= ${binary:Version}),
+ libreoffice-dev-common (= ${source:Version}),
${idlc-cpp-depends},
${misc:Depends},
${shlibs:Depends}
@@ -4373,15 +4374,28 @@ Suggests: libmythes-dev, libreoffice-dev-doc,
libreofficekit-dev
Replaces: libreoffice-common (<< 1:4.1.0~beta1),
libreoffice-core (<< 1:4.1.0~beta1)
Conflicts: libreoffice-dev-doc (<= 1:5.0.3~rc1-2)
-Description: office productivity suite -- SDK
+Description: office productivity suite -- SDK -- architecture-dependent parts
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the files needed to build plugins/add-ons for
- LibreOffice (includes, IDL files, build tools, ...).
+ This package contains the (architecture-dependent) files needed to build
+ plugins/add-ons for LibreOffice (build tools, libraries, arch-dependent
+ includes, ...).
.
It also contains the gengal and ui-previewer utilities.
+Package: libreoffice-dev-common
+Section: devel
+Architecture: all
+Replaces: libreoffice-dev (<< 1:5.2.0~)
+Breaks: libreoffice-dev (<< 1:5.2.0~)
+Description: office productivity suite -- SDK -- architecture-independent parts
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the (architecture-independent) files needed to build
+ plugins/add-ons for LibreOffice (includes, IDL files, ...)
+
Package: libreoffice-dev-doc
Section: doc
Architecture: all
diff --git a/control.sdk.in b/control.sdk.in
index 94ed23c..7b59ac4 100644
--- a/control.sdk.in
+++ b/control.sdk.in
@@ -3,6 +3,7 @@ Section: devel
Architecture: %OOO_ARCHS%
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-core (= ${binary:Version}),
+ libreoffice-dev-common (= ${source:Version}),
${idlc-cpp-depends},
${misc:Depends},
${shlibs:Depends}
@@ -10,15 +11,28 @@ Recommends: g++, ${java-common-depends},
${java-runtime-depends}
Suggests: libmythes-dev, libreofficekit-dev, libreoffice-dev-doc
Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<<
1:4.1.0~beta1)
Conflicts: libreoffice-dev-doc (<= 1:5.0.3~rc1-2)
-Description: office productivity suite -- SDK
+Description: office productivity suite -- SDK -- architecture-dependent parts
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the files needed to build plugins/add-ons for
- LibreOffice (includes, IDL files, build tools, ...).
+ This package contains the (architecture-dependent) files needed to build
+ plugins/add-ons for LibreOffice (build tools, libraries, arch-dependent
+ includes, ...).
.
It also contains the gengal and ui-previewer utilities.
+Package: libreoffice-dev-common
+Section: devel
+Architecture: all
+Replaces: libreoffice-dev (<< 1:5.2.0~)
+Breaks: libreoffice-dev (<< 1:5.2.0~)
+Description: office productivity suite -- SDK -- architecture-independent parts
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the (architecture-independent) files needed to build
+ plugins/add-ons for LibreOffice (includes, IDL files, ...)
+
Package: libreoffice-dev-doc
Section: doc
Architecture: all
diff --git a/rules b/rules
index 8bb52c3..3b852c8 100755
--- a/rules
+++ b/rules
@@ -2258,6 +2258,38 @@ ifeq "$(BUILD_GTK)" "y"
endif
ifeq "$(PACKAGE_SDK)" "y"
+ # move arch-indep stuff into a libreoffice-dev-common
+ mkdir -p $(PKGDIR)-dev-common/usr/include
+ mv $(PKGDIR)-dev/usr/include/libreoffice \
+ $(PKGDIR)-dev-common/usr/include
+ # except include/sal/typesizes.h
+ mkdir -p $(PKGDIR)-dev/usr/include/libreoffice/sal
+ mv $(PKGDIR)-dev-common/usr/include/libreoffice/sal/typesizes.h \
+ $(PKGDIR)-dev/usr/include/libreoffice/sal
+ mkdir -p $(PKGDIR)-dev-common/usr/share/idl
+ mv $(PKGDIR)-dev/usr/share/idl/libreoffice \
+ $(PKGDIR)-dev-common/usr/share/idl
+ mkdir -p $(PKGDIR)-dev-common/$(OOSDKDIR)
+ mv $(PKGDIR)-dev/$(OOSDKDIR)/classes \
+ $(PKGDIR)-dev-common/$(OOSDKDIR)
+ mv $(PKGDIR)-dev/$(OOSDKDIR)/set* \
+ $(PKGDIR)-dev-common/$(OOSDKDIR)
+ mv $(PKGDIR)-dev/$(OOSDKDIR)/config* \
+ $(PKGDIR)-dev-common/$(OOSDKDIR)
+ mv $(PKGDIR)-dev/$(OOSDKDIR)/index.html* \
+ $(PKGDIR)-dev-common/$(OOSDKDIR)
+ mkdir -p $(PKGDIR)-dev-common/usr/share/libreoffice/sdk
+ mv $(PKGDIR)-dev/usr/share/libreoffice/sdk/classes \
+ $(PKGDIR)-dev-common/usr/share/libreoffice/sdk
+ifeq "$(PACKAGE_SDK)" "y"
+ mkdir -p $(PKGDIR)-dev-common/$(OODIR)/share/glade
+ mv $(PKGDIR)-common/$(OODIR)/share/glade/libreoffice-catalog.xml \
+ $(PKGDIR)-dev-common/$(OODIR)/share/glade
+else
+ rm -rf $(PKGDIR)-common/$(OODIR)/share/glade
+endif
+
+ ifeq "$(PACKAGE_SDK_DOCS)" "y"
# move SDK documentation into own package
rm -rf $(PKGDIR)-dev-doc
mkdir -p $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev
@@ -2269,8 +2301,33 @@ ifeq "$(PACKAGE_SDK)" "y"
mv $(PKGDIR)-dev/$(OOSDKDIR)/examples \
$(PKGDIR)-dev-doc/$(OOSDKDIR)
# and fix the symlink now dangling due to the move above
- cd $(PKGDIR)-dev/$(OOSDKDIR) && \
+ cd $(PKGDIR)-dev-common/$(OOSDKDIR) && \
ln -sf /usr/share/doc/libreoffice-dev/sdk/index.html
+ endif
+
+ifeq "$(PACKAGE_SDK)" "y"
+ ifeq "$(ENABLE_JAVA)" "y"
+ # compat/safety symlink for SDK Java stuff moved to /usr/share
+ rm -f $(PKGDIR)-dev-common/$(OOSDKDIR)/classes
+ mkdir -p
$(PKGDIR)-dev-common/$(OOSDKDIR)/classes/com/sun/star/lib/loader
+ cd $(PKGDIR)-dev-common/$(OOSDKDIR)/classes/com/sun/star/lib/loader && \
+ for i in $(CURDIR)/$(PKGDIR)-dev-common/$(shell echo
$(OOSDKDIR) | sed -e s/lib/share/)/classes/com/sun/star/lib/loader/*.class; do \
+ ln -s `echo $$i | sed -e
's,$(CURDIR)/$(PKGDIR)-dev-common,,'` `basename $$i`; \
+ done
+ ifeq "$(PACKAGE_UNOWINREG_DLL)" "y"
+ mkdir -p $(PKGDIR)-dev-common/$(OOSDKDIR)/classes/win
+ chmod 644 $(PKGDIR)-dev-common/$(shell echo $(OOSDKDIR) | sed -e
s/lib/share/)/classes/win/unowinreg.dll
+ ln -s /$(shell echo $(OOSDKDIR) | sed -e
s/lib/share/)/classes/win/unowinreg.dll \
+ $(PKGDIR)-dev-common/$(OOSDKDIR)/classes/win/unowinreg.dll
+ else
+ rm -rf $(PKGDIR)-dev-common/$(shell echo $(OOSDKDIR) | sed -e
s/lib/share/)/classes/win
+ endif
+ endif
+ chmod 644 $(PKGDIR)-dev-common/$(OOSDKDIR)/configure.pl
+ chmod 755 $(PKGDIR)-dev-common/$(OOSDKDIR)/setsdkenv_unix
+
+ # fix permissions
+ find $(PKGDIR)-dev-common/usr/share/idl/$(OODIRNAME) -type f -exec
chmod 644 {} \;
endif
ifeq "$(ENABLE_EVO2)" "y"
@@ -2280,14 +2337,6 @@ ifeq "$(ENABLE_EVO2)" "y"
$(PKGDIR)-evolution/$(OODIR)/presets/database
endif
-ifeq "$(PACKAGE_SDK)" "y"
- mkdir -p $(PKGDIR)-dev/$(OODIR)/share/glade
- mv $(PKGDIR)-common/$(OODIR)/share/glade/libreoffice-catalog.xml \
- $(PKGDIR)-dev/$(OODIR)/share/glade
-else
- rm -rf $(PKGDIR)-common/$(OODIR)/share/glade
-endif
-
# Access2Base IMHO clearly is -base specific :-)
ifeq "$(PACKAGE_BASE)" "y"
mkdir -p $(PKGDIR)-base/$(OODIR)/share/basic
@@ -2670,26 +2719,6 @@ endif
# should be empty now, remove if there
rm -rf $(PKGDIR)-core/$(OODIR)/ure
-ifeq "$(PACKAGE_SDK)" "y"
- ifeq "$(ENABLE_JAVA)" "y"
- # compat/safety symlink for SDK Java stuff moved to /usr/share
- rm -f $(PKGDIR)-dev/$(OOSDKDIR)/classes
- mkdir -p $(PKGDIR)-dev/$(OOSDKDIR)/classes/com/sun/star/lib/loader
- cd $(PKGDIR)-dev/$(OOSDKDIR)/classes/com/sun/star/lib/loader && \
- for i in $(CURDIR)/$(PKGDIR)-dev/$(shell echo $(OOSDKDIR) | sed
-e s/lib/share/)/classes/com/sun/star/lib/loader/*.class; do \
- ln -s `echo $$i | sed -e 's,$(CURDIR)/$(PKGDIR)-dev,,'`
`basename $$i`; \
- done
- ifeq "$(PACKAGE_UNOWINREG_DLL)" "y"
- mkdir -p $(PKGDIR)-dev/$(OOSDKDIR)/classes/win
- chmod 644 $(PKGDIR)-dev/$(shell echo $(OOSDKDIR) | sed -e
s/lib/share/)/classes/win/unowinreg.dll
- ln -s /$(shell echo $(OOSDKDIR) | sed -e
s/lib/share/)/classes/win/unowinreg.dll \
- $(PKGDIR)-dev/$(OOSDKDIR)/classes/win/unowinreg.dll
- else
- rm -rf $(PKGDIR)-dev/$(shell echo $(OOSDKDIR) | sed -e
s/lib/share/)/classes/win
- endif
- endif
- chmod 644 $(PKGDIR)-dev/$(OOSDKDIR)/configure.pl
- chmod 755 $(PKGDIR)-dev/$(OOSDKDIR)/setsdkenv_unix
# create wrapper scripts
cd $(PKGDIR)-dev/$(OOSDKDIR)/bin && \
for i in *; do \
@@ -2706,9 +2735,6 @@ ifeq "$(PACKAGE_SDK)" "y"
cd $(PKGDIR)-dev/$(OOSDKDIR) && \
rm docs
- # fix permissions
- find $(PKGDIR)-dev/usr/share/idl/$(OODIRNAME) -type f -exec chmod 644
{} \;
-
rm -f $(PKGDIR)-dev/usr/share/doc/libreoffice/sdk/readme/LICENSE.gz
endif
@@ -3413,6 +3439,11 @@ ifneq ($(PACKAGE_SDK_DOCS),y)
echo "For uploads with binary-all packages, please use arches where the
SDK docs are enabled!!!!"
echo
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
endif
+ifneq ($(PACKAGE_UNOWINREG_DLL),y)
+ echo
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ echo "For uploads with binary-all packages, please use arches where
unowinregl.dll is packaged!!!!"
+ echo
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+endif
dh_testdir
dh_testroot
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
