r35411 - in /packages/scilab/trunk/debian: changelog patches/installicons.diff patches/series rules scilab.desktop scilab.menu
sylvestre-guest at users.alioth.debian.org
sylvestre-guest at users.alioth.debian.org
Tue Jan 6 16:18:15 UTC 2009
Author: sylvestre-guest
Date: Tue Jan 6 16:18:15 2009
New Revision: 35411
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35411
Log:
+ * Install the icon
+ * Fix a problem in the scilab.desktop file (thanks to Christoph Korn)
+ * Icons added to the menu item
Added:
packages/scilab/trunk/debian/patches/installicons.diff
Modified:
packages/scilab/trunk/debian/changelog
packages/scilab/trunk/debian/patches/series
packages/scilab/trunk/debian/rules
packages/scilab/trunk/debian/scilab.desktop
packages/scilab/trunk/debian/scilab.menu
Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=35411&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Tue Jan 6 16:18:15 2009
@@ -3,6 +3,9 @@
* Missing dep to ant & docbook-xsl
* Information about the LGPL added in the copyright file
* Force a minimal version of jeuclid
+ * Install the icon
+ * Fix a problem in the scilab.desktop file (thanks to Christoph Korn)
+ * Icons added to the menu item
-- Sylvestre Ledru <sylvestre.ledru at inria.fr> Tue, 30 Dec 2008 09:38:59 +0100
Added: packages/scilab/trunk/debian/patches/installicons.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/installicons.diff?rev=35411&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/installicons.diff (added)
+++ packages/scilab/trunk/debian/patches/installicons.diff Tue Jan 6 16:18:15 2009
@@ -1,0 +1,135 @@
+commit bfb8b3499e38c9eee1e02dc98b760faf7964bc11
+Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
+Date: Tue Jan 6 14:48:46 2009 +0100
+
+ Install also the icon
+
+diff --git a/scilab/Makefile.am b/scilab/Makefile.am
+index 105add0..dfddd7c 100644
+--- a/scilab/Makefile.am
++++ b/scilab/Makefile.am
+@@ -89,6 +89,8 @@ $(top_srcdir)/RELEASE_NOTES \
+ $(top_srcdir)/Readme_Visual.txt \
+ $(top_srcdir)/README_Windows.txt
+
++iconsdir=$(pkgdatadir)/icons/
++icons_DATA = $(top_srcdir)/X11_defaults/scilab.xpm
+
+ profilingdir=$(pkgdatadir)/tools/profiling/
+ profiling_DATA = $(top_srcdir)/tools/profiling/valgrind.supp
+diff --git a/scilab/Makefile.in b/scilab/Makefile.in
+index cd8ef2f..bd6b7a0 100644
+--- a/scilab/Makefile.in
++++ b/scilab/Makefile.in
+@@ -84,8 +84,9 @@ CONFIG_CLEAN_FILES = modules/helptools/macros/xmlfiletohtml.sci \
+ scilab-lib-doc.properties
+ @ENABLE_STATIC_TRUE at am__EXEEXT_1 = scilab-static-bin$(EXEEXT)
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
+- "$(DESTDIR)$(infofilesdir)" "$(DESTDIR)$(pkgconfigdir)" \
+- "$(DESTDIR)$(profilingdir)" "$(DESTDIR)$(rootdir)"
++ "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(infofilesdir)" \
++ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(profilingdir)" \
++ "$(DESTDIR)$(rootdir)"
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_scilab_bin_OBJECTS = scilab_bin-main_linux.$(OBJEXT)
+@@ -138,12 +139,13 @@ am__vpath_adj = case $$p in \
+ *) f=$$p;; \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++iconsDATA_INSTALL = $(INSTALL_DATA)
+ infofilesDATA_INSTALL = $(INSTALL_DATA)
+ pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+ profilingDATA_INSTALL = $(INSTALL_DATA)
+ rootDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(infofiles_DATA) $(pkgconfig_DATA) $(profiling_DATA) \
+- $(root_DATA)
++DATA = $(icons_DATA) $(infofiles_DATA) $(pkgconfig_DATA) \
++ $(profiling_DATA) $(root_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+@@ -403,6 +405,8 @@ $(top_srcdir)/RELEASE_NOTES \
+ $(top_srcdir)/Readme_Visual.txt \
+ $(top_srcdir)/README_Windows.txt
+
++iconsdir = $(pkgdatadir)/icons/
++icons_DATA = $(top_srcdir)/X11_defaults/scilab.xpm
+ profilingdir = $(pkgdatadir)/tools/profiling/
+ profiling_DATA = $(top_srcdir)/tools/profiling/valgrind.supp
+
+@@ -607,6 +611,23 @@ clean-libtool:
+
+ distclean-libtool:
+ -rm -f libtool
++install-iconsDATA: $(icons_DATA)
++ @$(NORMAL_INSTALL)
++ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
++ @list='$(icons_DATA)'; for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ f=$(am__strip_dir) \
++ echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
++ $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
++ done
++
++uninstall-iconsDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(icons_DATA)'; for p in $$list; do \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
++ done
+ install-infofilesDATA: $(infofiles_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(infofilesdir)" || $(MKDIR_P) "$(DESTDIR)$(infofilesdir)"
+@@ -961,7 +982,7 @@ check: check-recursive
+ all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) all-local
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infofilesdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(profilingdir)" "$(DESTDIR)$(rootdir)"; do \
++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(infofilesdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(profilingdir)" "$(DESTDIR)$(rootdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-recursive
+@@ -1010,8 +1031,9 @@ info: info-recursive
+
+ info-am:
+
+-install-data-am: install-data-local install-infofilesDATA \
+- install-pkgconfigDATA install-profilingDATA install-rootDATA
++install-data-am: install-data-local install-iconsDATA \
++ install-infofilesDATA install-pkgconfigDATA \
++ install-profilingDATA install-rootDATA
+
+ install-dvi: install-dvi-recursive
+
+@@ -1050,8 +1072,9 @@ ps: ps-recursive
+ ps-am:
+
+ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+- uninstall-infofilesDATA uninstall-pkgconfigDATA \
+- uninstall-profilingDATA uninstall-rootDATA
++ uninstall-iconsDATA uninstall-infofilesDATA \
++ uninstall-pkgconfigDATA uninstall-profilingDATA \
++ uninstall-rootDATA
+
+ .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
+@@ -1067,7 +1090,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+ install install-am install-binPROGRAMS install-binSCRIPTS \
+ install-data install-data-am install-data-local install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am \
++ install-html-am install-iconsDATA install-info install-info-am \
+ install-infofilesDATA install-man install-pdf install-pdf-am \
+ install-pkgconfigDATA install-profilingDATA install-ps \
+ install-ps-am install-rootDATA install-strip installcheck \
+@@ -1075,7 +1098,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am \
+- uninstall-binPROGRAMS uninstall-binSCRIPTS \
++ uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-iconsDATA \
+ uninstall-infofilesDATA uninstall-pkgconfigDATA \
+ uninstall-profilingDATA uninstall-rootDATA
+
Modified: packages/scilab/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/series?rev=35411&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/series (original)
+++ packages/scilab/trunk/debian/patches/series Tue Jan 6 16:18:15 2009
@@ -7,3 +7,4 @@
misctcl.diff
malloc.diff
unused-classpath.diff
+installicons.diff
Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=35411&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Tue Jan 6 16:18:15 2009
@@ -63,12 +63,12 @@
moduleName=`echo $$dir|sed -e "s|.*/\(.*\)|\1|"`; \
target=$(CURDIR)/debian/scilab-doc/usr/share/scilab/modules/$$moduleName; \
target_test=$(CURDIR)/debian/scilab-test/usr/share/scilab/modules/$$moduleName; \
- # Move tests in the right package; \
+# Move tests in the right package; \
if test -d $$dir/tests; then \
mkdir -p $$target_test; \
mv $$dir/tests $$target_test; \
fi; \
- # Move the help in the right package; \
+# Move the help in the right package; \
if test -d $$dir/demos -o -d $$dir/help/en_US/; then \
mkdir -p $$target/help; \
fi; \
@@ -92,6 +92,9 @@
mkdir -p $(CURDIR)/debian/libscilab-java/usr/share/java/
mv debian/tmp/usr/share/scilab/modules/javasci/jar/javasci.jar $(CURDIR)/debian/libscilab-java/usr/share/java/
+# Move icons
+ mkdir -p $(CURDIR)/debian/scilab/usr/share/scilab/
+ mv debian/tmp/usr/share/scilab/icons/ $(CURDIR)/debian/scilab/usr/share/scilab/
binary-install/scilab::
dh_desktop -p scilab
Modified: packages/scilab/trunk/debian/scilab.desktop
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab.desktop?rev=35411&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab.desktop (original)
+++ packages/scilab/trunk/debian/scilab.desktop Tue Jan 6 16:18:15 2009
@@ -1,14 +1,17 @@
[Desktop Entry]
-Comment=a scientific software package for numerical computations
+Comment=Scientific software package for numerical computations
+Comment[fr]=Logiciel scientifique de calcul numérique
Comment[de]=eine Wissenschaftssoftware für numerische Berechnungen
Encoding=UTF-8
Exec=scilab
GenericName=Scientific Software Package
+GenericName[fr]=Logiciel de calcul numérique
GenericName[de]=Wissenschaftssoftware
-Icon=/usr/lib/scilab-4.1/X11_defaults/scilab.xpm
+Icon=/usr/share/scilab/icons/scilab.xpm
Name=Scilab
Name[de]=Scilab
StartupNotify=false
Terminal=false
Type=Application
Categories=Science;Math;Engineering;
+
Modified: packages/scilab/trunk/debian/scilab.menu
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab.menu?rev=35411&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab.menu (original)
+++ packages/scilab/trunk/debian/scilab.menu Tue Jan 6 16:18:15 2009
@@ -1,12 +1,14 @@
?package(scilab):\
needs="x11"\
section="Applications/Science/Mathematics"\
+ icon="/usr/share/scilab/icons/scilab.xpm" \
title="Scilab"\
command="/usr/bin/scilab"
?package(scilab):\
needs="text"\
section="Applications/Science/Mathematics"\
+ icon="/usr/share/scilab/icons/scilab.xpm" \
title="Scilab"\
command="/usr/bin/scilab -nw"
More information about the debian-science-commits
mailing list