The following commit has been merged in the master branch:
commit 06af786027fc439572b0db435af4cfe6b323898f
Author: Rene Engelhard <[email protected]>
Date: Sun Jan 8 16:00:53 2012 +0100
fix qstart.desktop Exec=
diff --git a/changelog b/changelog
index 0d88685..5dec465 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.4.5~rc2-1) UNRELEASED; urgency=low
+libreoffice (1:3.4.5~rc2-1) UNRELEASED; urgency=medium
[ Rene Engelhard ]
* new upstream release
@@ -14,11 +14,12 @@ libreoffice (1:3.4.5~rc2-1) UNRELEASED; urgency=low
lintian
* debian/rules:
- prevent creating bogus gcc- build-dependency on gcj archs
+ - fix qstart.desktop Exec= (closes: #655076)
* merge from ubuntu-precise-3.5:
- add debian multiarch support for Qt4
- -- Rene Engelhard <[email protected]> Tue, 03 Jan 2012 18:46:10 +0100
+ -- Rene Engelhard <[email protected]> Sun, 08 Jan 2012 15:52:13 +0100
libreoffice (1:3.4.4-2) unstable; urgency=medium
diff --git a/rules b/rules
index 6efe024..d128e71 100755
--- a/rules
+++ b/rules
@@ -2477,8 +2477,8 @@ ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
# qstart.desktop is different to the above. Should be handled by
# --with-unix-wrapper of ooo-build but that somehow doesn't work as
# expected. FIXME.
- PRODUCTVERSION=`grep PRODUCTVERSION
$(SOURCE_TREE)/sysui/desktop/productversion.mk | head -n 1 | cut -d"=" -f2 |
sed -e s/\ //g`; \
- sed -i -e "s,Exec=libreoffice$$PRODUCTVERSION,Exec=ooffice$(VER)," \
+ PRODUCTVERSION=`grep PRODUCTVERSION
$(SOURCE_TREE)/solenv/inc/productversion.mk | head -n 1 | cut -d"=" -f2 | sed
-e s/\ //g`; \
+ sed -i -e "s,Exec=libreoffice$$PRODUCTVERSION,Exec=libreoffice$(VER)," \
-e "s,Name=LibreOffice $$PRODUCTVERSION,Name=LibreOffice
$(VER)," \
-e "s/ / /" \
$(PKGDIR)-gtk/$(OOBRANDDIR)/share/xdg/qstart.desktop
--
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]
