The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit c0a1e706367d0ab0521e577ced7c0699ee48e65b
Author: Bjoern Michaelsen <[email protected]>
Date: Fri Apr 15 09:51:13 2011 +0200
lp#732412: workaround for unity writer icon issue
diff --git a/changelog b/changelog
index e7dab78..798f626 100644
--- a/changelog
+++ b/changelog
@@ -1,13 +1,13 @@
libreoffice (1:3.3.2-1ubuntu3) UNRELEASED; urgency=low
- [ Bjoern Michaelsen ]
* make build dep on xulrunner-dev alternatively depend on firefox-dep (LP:
#740815)
- * regenerated control file
* cherry-pick from debian:
- enable is (icelandic) l10n (LP: #751746)
* add unity quicklist support (LP: #720716)
+ * workaround for unity icon issue (LP: #732412)
+ * regenerated control file
- -- Bjoern Michaelsen <[email protected]> Fri, 15 Apr 2011
09:41:49 +0200
+ -- Bjoern Michaelsen <[email protected]> Fri, 15 Apr 2011
09:49:16 +0200
libreoffice (1:3.3.2-1ubuntu2) natty; urgency=low
diff --git a/rules b/rules
index dedf866..384b82c 100755
--- a/rules
+++ b/rules
@@ -2964,6 +2964,8 @@ ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
-e 's/ / /' \
< $$dirname/javafilter.desktop \
>
$(PKGDIR)-filter-mobiledev/usr/share/applications/libreoffice$(VER)-javafilter.desktop
|| exit 1
+ # hack for lp#732412
+ rm
$(PKGDIR)-filter-mobiledev/usr/share/applications/libreoffice$(VER)-javafilter.desktop
endif
endif
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
