The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 797e6f85ee19f28028f673aa793cf8917da4412f
Author: Bjoern Michaelsen <[email protected]>
Date:   Tue Oct 25 14:08:49 2011 +0200

    reintroduce workaround for unity icon issue (LP: #732412)

diff --git a/changelog b/changelog
index 5c399c7..feec270 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.4.3-3ubuntu3) oneiric; urgency=low
+
+  * reintroduce workaround for unity icon issue (LP: #732412)
+
+ -- Bjoern Michaelsen <[email protected]>  Tue, 25 Oct 2011 
14:06:25 +0200
+
 libreoffice (1:3.4.3-3ubuntu2) oneiric; urgency=low
 
   * hard hack to make upload happy: Pre-Depends on xz-capable dpkg
diff --git a/rules b/rules
index b5672c8..92e413e 100755
--- a/rules
+++ b/rules
@@ -2961,6 +2961,8 @@ ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
        perl -pi -e 's/ Supported by Sun Microsystems.//' 
$(PKGDIR)-common//usr/share/applications/libreoffice$(VER)-startcenter.desktop
        # invalid, according to lintian. make it shut up.
        perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//; 
s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;' 
$(PKGDIR)-common/usr/share/applications/libreoffice$(VER)-startcenter.desktop
+       # hack for lp#732412
+       rm 
$(PKGDIR)-filter-mobiledev/usr/share/applications/libreoffice$(VER)-javafilter.desktop
 endif
 
        # install .applications, .keys, .mime and openoffice.org.xml for

-- 
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]

Reply via email to