The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit d23e83559fb532590a2365c112faa3aa911659b7
Author: Rene Engelhard <r...@debian.org>
Date: Mon Jun 11 12:49:34 2012 +0200
remove obsolete rm -rf preventing -report-builders contents getting packaged
Conflicts:
changelog
diff --git a/changelog b/changelog
index 5036fc4..ffb6c79 100644
--- a/changelog
+++ b/changelog
@@ -22,6 +22,14 @@ libreoffice (1:3.6.0~beta1-1) UNRELEASED; urgency=low
- build-depend against libpng-dev instead of libpng12-dev
(closes: #662411)
- remove squeeze-backports stuff, add wheezy-backports
+ - 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
+ (LP: #992232)
+ * debian/changelog:
+ - mention recent security fixes in respective changelog entries
-- Rene Engelhard <r...@debian.org> Thu, 03 May 2012 13:44:05 +0200
diff --git a/rules b/rules
index 96e5580..58f7d04 100755
--- a/rules
+++ b/rules
@@ -2329,7 +2329,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
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sinyw-0005sh...@vasks.debian.org
