[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.1.0_beta2-1-3-gdd1d8b3

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-4.1 branch:
commit aa74f7374d3cbe531d9ea033fb2dbdec03fe4abc
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Jun 10 15:31:05 2013 +0200

    fix librpt* move

diff --git a/changelog b/changelog
index e1e0212..866a0a0 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ libreoffice (1:4.1.0~beta2-2) UNRELEASED; urgency=low
   * debian/rules:
     - revert back to using gcj on kfreebsd-*, OpenJDK7 doesn't work (hangs) or
       still isn't available... (kfreebsd-i386)
+    - fix librpt* move, install path differs between binary-only and full
+      builds, sigh.
 
  -- Rene Engelhard <rene@debian.org>  Mon, 10 Jun 2013 08:47:47 +0200
 
diff --git a/rules b/rules
index ccd84cc..aca3439 100755
--- a/rules
+++ b/rules
@@ -2478,7 +2478,11 @@ else
 	# move rpt stuff into -report-builder-bin
 	rm -rf $(PKGDIR)-report-builder-bin
 	mkdir -p $(PKGDIR)-report-builder-bin/$(OODIR)/program
-	mv $(PKGDIR)-report-builder/$(OODIR)/program/librpt* \
+	# FIXME: it seems that --enable/--disable-reportbuiler affects the install
+	# location. sigh.
+	if [ -e $(PKGDIR)-core/$(OODIR)/program/librptlo.so ]; then \
+		i=core; else i=report-builder; fi; \
+	mv $(PKGDIR)-$$i/$(OODIR)/program/librpt* \
 		$(PKGDIR)-report-builder-bin/$(OODIR)/program
   endif
 endif

-- 
LibreOffice packaging repository