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

[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.5_rc2-1-220-g783dab2



The following commit has been merged in the debian-experimental-4.0 branch:
commit 1f6988b48b89b09ebda2d355c8820b8e2a388bd5
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Jan 22 00:35:45 2013 +0100

    move ui-previewer into -dev

diff --git a/control b/control
index baab1bd..679b074 100644
--- a/control
+++ b/control
@@ -3236,6 +3236,7 @@ Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe pp
 Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${idlc-cpp-depends}
 Recommends: dmake, g++, ${java-runtime-depends}, ${java-common-depends}
 Suggests: libreoffice-dev-doc, libmythes-dev, c-shell
+Replaces: libreoffice-core (<< 1:4.0.0~rc2)
 Description: office productivity suite -- SDK
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.sdk.in b/control.sdk.in
index a3f3bdc..26055c3 100644
--- a/control.sdk.in
+++ b/control.sdk.in
@@ -12,6 +12,7 @@ Recommends: dmake,
 Suggests: libreoffice-dev-doc,
  libmythes-dev,
  c-shell
+Replaces: libreofficeVER-core (<< 1:4.0.0~rc2)
 Description: office productivity suite -- SDK
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff --git a/rules b/rules
index dd227ae..52123da 100755
--- a/rules
+++ b/rules
@@ -2399,6 +2399,14 @@ endif
 #	install -m755 $(SOURCE_TREE)/svx/$(shell .  $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
 #		$(PKGDIR)-dev/$(OODIR)/program/gengal.bin
 #endif
+ifeq "$(PACKAGE_SDK)" "y"
+	# move ui-previewer into -dev
+	mkdir -p $(PKGDIR)-dev/$(OODIR)/program
+	mv $(PKGDIR)-core/$(OODIR)/program/ui-previewer \
+		$(PKGDIR)-dev/$(OODIR)/program
+else
+	rm -f $(PKGDIR)-core/$(OODIR)/program/ui-previewer
+endif
 
 	for i in $(ARCH_DEP_PACKAGES); do \
 		if [ -e debian/$$i.bug-script.in ]; then \

-- 
LibreOffice packaging repository


Reply to: