[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-4-8-gf106efe
The following commit has been merged in the master branch:
commit cc4140614b72c5640a0b60806fc98b5b9d7fdc46
Author: Rene Engelhard <rene@debian.org>
Date: Fri Oct 21 16:08:23 2011 +0200
also add icon version to debian menus (closes: #645953)
diff --git a/changelog b/changelog
index 23fef91..6ffdfa2 100644
--- a/changelog
+++ b/changelog
@@ -9,8 +9,10 @@ libreoffice (1:3.4.3-5) UNRELEASED; urgency=low
* debian/watch:
- point to libreoffice-bootstrap-(\d.\d.\d).\d.tar.bz2 in debian/watch;
does not suffice but we should reference the source and not binaries
+ * debian/rules, debian/*.menu.in:
+ - also add icon version to debian menus (closes: #645953)
- -- Rene Engelhard <rene@debian.org> Tue, 18 Oct 2011 14:31:19 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 21 Oct 2011 16:05:19 +0200
libreoffice (1:3.4.3-4) unstable; urgency=low
diff --git a/control b/control
index 26647fd..4f2fa51 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel !sparc], libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, dpkg-dev (>= 1.15.6), python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf
i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), mingw-w64 (>= 1.0), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libservlet2.5-java, javahelper (>= 0.37~), xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-de
v (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev [!armel], libpq-dev (>= 9.0~), libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, liborbit2-dev, libldap2-dev
+Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel !sparc], libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, dpkg-dev (>= 1.15.6), python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf
i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), mingw-w64 (>= 1.0), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java [!armel], libsac-java [!armel], libxml-java (>= 1.1.6) [!armel], libflute-java (>= 1.1.6) [!armel], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel], liblayout-java (>= 0.2.10) [!armel], libloader-java (>= 1.1.6) [!armel], libformula-java (>= 1.1.7) [!armel], librepository-java (>= 1.1.6) [!armel], libfonts-java (>= 1.1.6) [!armel], libserializer-java (>= 1.1.6) [!armel], libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~), xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia
64 kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev [!armel], libpq-dev (>= 9.0~), libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, libr
df0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, liborbit2-dev, libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge, translate-toolkit (>= 1.9)
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11), base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
diff --git a/libreoffice-base.menu.in b/libreoffice-base.menu.in
index 6a2f4c4..378be53 100644
--- a/libreoffice-base.menu.in
+++ b/libreoffice-base.menu.in
@@ -1,4 +1,4 @@
?package(libreoffice-base):needs="X11" section="Applications/Data Management" \
title="LibreOffice Base" command="/usr/bin/libreoffice --base"\
kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-base.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/libreoffice@ICONVERSION@-base.xpm"
diff --git a/libreoffice-calc.menu.in b/libreoffice-calc.menu.in
index 3927362..70d2a57 100644
--- a/libreoffice-calc.menu.in
+++ b/libreoffice-calc.menu.in
@@ -2,4 +2,4 @@
title="LibreOffice Calc" command="/usr/bin/libreoffice --calc"\
hints="Spreadsheets"\
kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-calc.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/libreoffice@ICONVERSION@-calc.xpm"
diff --git a/libreoffice-draw.menu.in b/libreoffice-draw.menu.in
index 4583871..bd0cf4f 100644
--- a/libreoffice-draw.menu.in
+++ b/libreoffice-draw.menu.in
@@ -2,4 +2,4 @@
title="LibreOffice Draw" command="/usr/bin/libreoffice --draw"\
hints="Drawing"\
kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-draw.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/libreoffice@ICONVERSION@-draw.xpm"
diff --git a/libreoffice-impress.menu.in b/libreoffice-impress.menu.in
index d52e24a..6b6634b 100644
--- a/libreoffice-impress.menu.in
+++ b/libreoffice-impress.menu.in
@@ -2,4 +2,4 @@
title="LibreOffice Impress" command="/usr/bin/libreoffice --impress"\
hints="Presentation"\
kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-impress.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/libreoffice@ICONVERSION@-impress.xpm"
diff --git a/libreoffice-math.menu.in b/libreoffice-math.menu.in
index 60d883a..b2b1958 100644
--- a/libreoffice-math.menu.in
+++ b/libreoffice-math.menu.in
@@ -2,4 +2,4 @@
title="LibreOffice Math" command="/usr/bin/libreoffice --math"\
hints="Equation,Editor,Formula"\
kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-math.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/libreoffice@ICONVERSION@-math.xpm"
diff --git a/libreoffice-writer.menu.in b/libreoffice-writer.menu.in
index 6be2556..0af57c1 100644
--- a/libreoffice-writer.menu.in
+++ b/libreoffice-writer.menu.in
@@ -2,4 +2,4 @@
title="LibreOffice Writer" command="/usr/bin/libreoffice --writer"\
hints="Word Processors"\
kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-writer.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/libreoffice@ICONVERSION@-writer.xpm"
diff --git a/rules b/rules
index 433c7ef..a56c64d 100755
--- a/rules
+++ b/rules
@@ -2513,6 +2513,7 @@ endif
for i in base calc draw impress math writer; do \
cat debian/libreoffice$(VER)-$$i.menu.in \
| sed -e s/@VER@/$(VER)/ \
+ | sed -e s,@ICONVERSION@,$(shell echo $(OOVER) | sed -e "s/\.//g"), \
> debian/libreoffice$(VER)-$$i.menu; \
done; \
for i in base calc core draw impress math writer; do \
--
LibreOffice packaging repository
Reply to: