[libreoffice] 01/03: remove Debian menu stuff; as per TC resolution
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit 74b19da3e2f358bc465f32e0259a6caa7b19867c
Author: Rene Engelhard <rene@debian.org>
Date: Fri Sep 4 09:46:39 2015 +0200
remove Debian menu stuff; as per TC resolution
---
changelog | 8 +++++++-
control | 2 --
control.in | 3 +--
libreoffice-base.menu | 4 ----
libreoffice-calc.menu | 5 -----
libreoffice-draw.menu | 5 -----
libreoffice-impress.menu | 5 -----
libreoffice-math.menu | 5 -----
libreoffice-writer.menu | 5 -----
rules | 5 -----
10 files changed, 8 insertions(+), 39 deletions(-)
diff --git a/changelog b/changelog
index d519bab..f99626e 100644
--- a/changelog
+++ b/changelog
@@ -2,7 +2,13 @@ libreoffice (1:5.0.2~rc1~git20150830-1) UNRELEASED; urgency=medium
* New upstream snapshot
- -- Rene Engelhard <rene@debian.org> Wed, 12 Aug 2015 15:23:58 +0200
+ * debian/*.menu: remove, as per TC resolution
+ * debian/control.in: remove imagemagick from B-D-I:
+ * debian/rules:
+ - stop calling dh_installmenus and stop using convert to convert the icons
+ to xpm
+
+ -- Rene Engelhard <rene@debian.org> Fri, 04 Sep 2015 09:37:34 +0200
libreoffice (1:5.0.1-1) unstable; urgency=medium
diff --git a/control b/control
index 97060d5..26db361 100644
--- a/control
+++ b/control
@@ -147,7 +147,6 @@ Build-Depends: ant (>= 1.7.0),
Build-Depends-Indep: doxygen (>= 1.8.4),
fdupes,
fontforge,
- imagemagick,
libbase-java [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
libbsh-java,
libcommons-codec-java,
@@ -174,7 +173,6 @@ Build-Conflicts: amd-libopencl1,
g++-4.7 (<< 4.7.1-3),
gcj-4.2 (= 4.2.2-6),
gjdoc (= 0.7.8-2),
- graphicsmagick-imagemagick-compat (<< 1.3.9~),
libboost1.39-dev (<< 1.39.0-2),
libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64],
libc6-dev (= 2.6.1-3) [i386 amd64],
diff --git a/control.in b/control.in
index 1269b0c..9684b8c 100644
--- a/control.in
+++ b/control.in
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
Build-Depends: %BUILD_DEPS%,
-Build-Depends-Indep: fdupes, imagemagick, %BUILD_DEPS_INDEP%
+Build-Depends-Indep: fdupes, %BUILD_DEPS_INDEP%
Build-Conflicts: ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%],
ant (= 1.8.0-2) [%OOO_GCJ_JDK_ARCHS%],
ant (= 1.8.0-3) [%OOO_GCJ_JDK_ARCHS%],
@@ -14,7 +14,6 @@ Build-Conflicts: ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%],
g++-4.7 (<< 4.7.1-3),
gcj-4.2 (= 4.2.2-6),
gjdoc (= 0.7.8-2),
- graphicsmagick-imagemagick-compat (<< 1.3.9~),
libboost1.39-dev (<< 1.39.0-2),
libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64],
libc6-dev (= 2.6.1-3) [i386 amd64],
diff --git a/libreoffice-base.menu b/libreoffice-base.menu
deleted file mode 100644
index 6a2f4c4..0000000
--- a/libreoffice-base.menu
+++ /dev/null
@@ -1,4 +0,0 @@
-?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"
diff --git a/libreoffice-calc.menu b/libreoffice-calc.menu
deleted file mode 100644
index 3927362..0000000
--- a/libreoffice-calc.menu
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(libreoffice-calc):needs="X11" section="Applications/Office"\
- title="LibreOffice Calc" command="/usr/bin/libreoffice --calc"\
- hints="Spreadsheets"\
- kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-calc.xpm"
diff --git a/libreoffice-draw.menu b/libreoffice-draw.menu
deleted file mode 100644
index 4583871..0000000
--- a/libreoffice-draw.menu
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(libreoffice-draw):needs="X11" section="Applications/Graphics"\
- title="LibreOffice Draw" command="/usr/bin/libreoffice --draw"\
- hints="Drawing"\
- kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-draw.xpm"
diff --git a/libreoffice-impress.menu b/libreoffice-impress.menu
deleted file mode 100644
index d52e24a..0000000
--- a/libreoffice-impress.menu
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(libreoffice-impress):needs="X11" section="Applications/Office"\
- title="LibreOffice Impress" command="/usr/bin/libreoffice --impress"\
- hints="Presentation"\
- kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-impress.xpm"
diff --git a/libreoffice-math.menu b/libreoffice-math.menu
deleted file mode 100644
index 60d883a..0000000
--- a/libreoffice-math.menu
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(libreoffice-math):needs="X11" section="Applications/Science/Mathematics"\
- title="LibreOffice Math" command="/usr/bin/libreoffice --math"\
- hints="Equation,Editor,Formula"\
- kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-math.xpm"
diff --git a/libreoffice-writer.menu b/libreoffice-writer.menu
deleted file mode 100644
index 6be2556..0000000
--- a/libreoffice-writer.menu
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(libreoffice-writer):needs="X11" section="Applications/Office"\
- title="LibreOffice Writer" command="/usr/bin/libreoffice --writer"\
- hints="Word Processors"\
- kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-writer.xpm"
diff --git a/rules b/rules
index 2fbc630..e46607b 100755
--- a/rules
+++ b/rules
@@ -2919,10 +2919,6 @@ else
rm -f $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/opens___.ttf
endif
- # convert icons to xpm; we need them for the Debian menu policy...
- cd $(PKGDIR)-common/usr/share/icons/hicolor/32x32/apps && \
- for x in *.png; do convert $$x `basename $$x .png`.xpm; done
-
# remove extra license files
rm -rf $(PKGDIR)-common/$(OODIR)/licenses
rm -f $(PKGDIR)-common/$(OODIR)/share/readme/LICENSE*
@@ -3168,7 +3164,6 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/
done
dh_installchangelogs -s -k
dh_installmime -s
- dh_installmenu -s
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(BUILD_JARS_NATIVE)" "y"
dh_nativejava -plibreoffice-gcj -o
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: