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

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4-3-11-g41f3b1c



The following commit has been merged in the master branch:
commit 41f3b1c96e084b1e9c4ec7b3a99261df6dc7b9fc
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Jun 11 12:49:34 2012 +0200

    remove obsolete rm -rf preventing -report-builders contents getting packaged

diff --git a/changelog b/changelog
index 96a537d..ca9bac3 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.5.4-4) UNRELEASED; urgency=low
+libreoffice (1:3.5.4-4) UNRELEASED; urgency=high
 
   * debian/patches/make-shortcuts-in-menus-localized-again.diff:
     backport from libreoffice-3-5; as name says, regression from 3.5.3
@@ -12,6 +12,8 @@ libreoffice (1:3.5.4-4) UNRELEASED; urgency=low
     - reenable Base on armel/armhf; apparently also fixed by
       yyinput-fix-for-unsigned-char.diff 
     - remove i386/amd64 special-casing, run junit checks on all archs
+    - remove obsolete rm -rf preventing -report-builders contents getting
+      packaged, thanks Björn Michaelsen for pointing out the empty package
   * debian/changelog: 
     - mention recent security fixes in respective changelog entries
 
diff --git a/rules b/rules
index a6e0540..776130a 100755
--- a/rules
+++ b/rules
@@ -2323,7 +2323,6 @@ ifneq "$(ENABLE_REPORTDESIGN)" "y"
 else
   ifeq "$(PACKAGE_BASE)" "y"
 	# move rpt stuff into -report-builder-bin
-	rm -rf $(PKGDIR)-report-builder
 	rm -rf $(PKGDIR)-report-builder-bin
 	mkdir -p $(PKGDIR)-report-builder-bin/$(OODIR)/program
 	mv $(PKGDIR)-base/$(OODIR)/program/librpt* \

-- 
LibreOffice packaging repository


Reply to: