The following commit has been merged in the debian-experimental-4.0 branch:
commit 08958e4017929bd84e6bab4a3f7f84b12467cc9a
Author: Benjamin Drung <[email protected]>
Date: Mon Mar 11 13:40:04 2013 +0100
Drop unneeded .menu file generation (no VER replacement any more).
diff --git a/libreoffice-base.menu.in b/libreoffice-base.menu
similarity index 100%
rename from libreoffice-base.menu.in
rename to libreoffice-base.menu
diff --git a/libreoffice-calc.menu.in b/libreoffice-calc.menu
similarity index 100%
rename from libreoffice-calc.menu.in
rename to libreoffice-calc.menu
diff --git a/libreoffice-draw.menu.in b/libreoffice-draw.menu
similarity index 100%
rename from libreoffice-draw.menu.in
rename to libreoffice-draw.menu
diff --git a/libreoffice-impress.menu.in b/libreoffice-impress.menu
similarity index 100%
rename from libreoffice-impress.menu.in
rename to libreoffice-impress.menu
diff --git a/libreoffice-math.menu.in b/libreoffice-math.menu
similarity index 100%
rename from libreoffice-math.menu.in
rename to libreoffice-math.menu
diff --git a/libreoffice-writer.menu.in b/libreoffice-writer.menu
similarity index 100%
rename from libreoffice-writer.menu.in
rename to libreoffice-writer.menu
diff --git a/rules b/rules
index c1346d2..f166819 100755
--- a/rules
+++ b/rules
@@ -1281,7 +1281,6 @@ clean-debdir:
rm -f debian/*.templates
rm -f debian/libreoffice-dev-doc.doc-base.*
- rm -f debian/*.menu
rm -f debian/*.install debian/*.dirs debian/*.changelog
rm -f debian/catalog.xml
rm -f debian/openoffice.org-dtd-officedocument1.0.xmlcatalogs
@@ -2198,12 +2197,6 @@ endif
perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//;
s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;'
$(PKGDIR)-$$i/$(OODIR)/share/xdg/$$i.desktop; \
done
perl -pi -e 's/Application;//'
$(PKGDIR)-gtk/$(OODIR)/share/xdg/qstart.desktop
- # add version to .menu
- for i in base calc draw impress math writer; do \
- cat debian/libreoffice-$$i.menu.in \
- | sed -e s/@VER@// \
- > debian/libreoffice-$$i.menu; \
- done; \
ifeq "$(ENABLE_PYTHON)" "y"
# PyUNO packaging
--
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]
