------------------------------------------------------------ revno: 2207 committer: Rene Engelhard <r...@debian.org> branch nick: debian timestamp: Thu 2010-11-18 02:05:37 +0100 message: update icon= in .menu modified: changelog libreoffice-base.menu.in libreoffice-calc.menu.in libreoffice-draw.menu.in libreoffice-impress.menu.in libreoffice-math.menu.in libreoffice-writer.menu.in rules
=== modified file 'changelog' --- a/changelog 2010-11-17 22:57:12 +0000 +++ b/changelog 2010-11-18 01:05:37 +0000 @@ -20,8 +20,9 @@ Kai Wasserbäch * debian/uno-libs3.symbols: update * debian/*.lintian-overrides.in: update for libreoffice + * debian/*.menu: update icon= - -- Rene Engelhard <r...@debian.org> Wed, 17 Nov 2010 18:58:40 +0100 + -- Rene Engelhard <r...@debian.org> Thu, 18 Nov 2010 02:03:52 +0100 libreoffice (1:3.3.0~beta3-1) experimental; urgency=low
=== modified file 'libreoffice-base.menu.in' --- a/libreoffice-base.menu.in 2010-10-12 00:40:55 +0000 +++ b/libreoffice-base.menu.in 2010-11-18 01:05:37 +0000 @@ -1,5 +1,5 @@ ?package(libreoffice-base):needs="X11" section="Applications/Data Management" \ title="LibreOffice Base" command="/usr/bin/oobase"\ kderemove="y"\ - icon="/usr/share/icons/hicolor/32x32/apps/openoffice...@iconversion@-base.xpm" + icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-base.xpm" === modified file 'libreoffice-calc.menu.in' --- a/libreoffice-calc.menu.in 2010-10-12 00:40:55 +0000 +++ b/libreoffice-calc.menu.in 2010-11-18 01:05:37 +0000 @@ -2,5 +2,5 @@ title="LibreOffice Calc" command="/usr/bin/oocalc"\ hints="Spreadsheets"\ kderemove="y"\ - icon="/usr/share/icons/hicolor/32x32/apps/openoffice...@iconversion@-calc.xpm" + icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-calc.xpm" === modified file 'libreoffice-draw.menu.in' --- a/libreoffice-draw.menu.in 2010-10-12 00:40:55 +0000 +++ b/libreoffice-draw.menu.in 2010-11-18 01:05:37 +0000 @@ -2,5 +2,5 @@ title="LibreOffice Draw" command="/usr/bin/oodraw"\ hints="Drawing"\ kderemove="y"\ - icon="/usr/share/icons/hicolor/32x32/apps/openoffice...@iconversion@-draw.xpm" + icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-draw.xpm" === modified file 'libreoffice-impress.menu.in' --- a/libreoffice-impress.menu.in 2010-10-12 00:40:55 +0000 +++ b/libreoffice-impress.menu.in 2010-11-18 01:05:37 +0000 @@ -2,5 +2,5 @@ title="LibreOffice Impress" command="/usr/bin/ooimpress"\ hints="Presentation"\ kderemove="y"\ - icon="/usr/share/icons/hicolor/32x32/apps/openoffice...@iconversion@-impress.xpm" + icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-impress.xpm" === modified file 'libreoffice-math.menu.in' --- a/libreoffice-math.menu.in 2010-10-12 00:40:55 +0000 +++ b/libreoffice-math.menu.in 2010-11-18 01:05:37 +0000 @@ -2,5 +2,5 @@ title="LibreOffice Math" command="/usr/bin/oomath"\ hints="Equation,Editor,Formula"\ kderemove="y"\ - icon="/usr/share/icons/hicolor/32x32/apps/openoffice...@iconversion@-math.xpm" + icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-math.xpm" === modified file 'libreoffice-writer.menu.in' --- a/libreoffice-writer.menu.in 2010-10-12 00:40:55 +0000 +++ b/libreoffice-writer.menu.in 2010-11-18 01:05:37 +0000 @@ -2,5 +2,5 @@ title="LibreOffice Writer" command="/usr/bin/oowriter"\ hints="Word Processors"\ kderemove="y"\ - icon="/usr/share/icons/hicolor/32x32/apps/openoffice...@iconversion@-writer.xpm" + icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-writer.xpm" === modified file 'rules' --- a/rules 2010-11-17 22:58:09 +0000 +++ b/rules 2010-11-18 01:05:37 +0000 @@ -2816,16 +2816,13 @@ done endif # add version to .menu and .lintian-overrides - ICONVERSION=`grep PRODUCTVERSION $(SOURCE_TREE)/sysui/desktop/productversion.mk | head -n 1 | cut -d"=" -f2 | cut -d"." -f1 | sed -e s/\ //g`; \ for i in base calc draw impress math writer; do \ cat debian/libreoffice$(VER)-$$i.menu.in \ - | sed -e s/@ICONVERSION@/$$ICONVERSION/ \ | sed -e s/@VER@/$(VER)/ \ > debian/libreoffice$(VER)-$$i.menu; \ done; \ for i in base calc core draw impress math writer; do \ cat debian/libreoffice$(VER)-$$i.lintian-overrides.in \ - | sed -e s/@ICONVERSION@/$$ICONVERSION/ \ | sed -e s/@VER@/$(VER)/ \ | sed -e s/@BASIS_VERSION@/$(BASIS_VERSION)/ \ > debian/libreoffice$(VER)-$$i.lintian-overrides; \