Packaging: 36/3536/4
Sylvestre Ledru [Tue, 15 Mar 2011 17:19:51 +0000 (18:19 +0100)]
==========

* In the source tree, Scilab's icons moved from icons/ to desktop/

* In the source tree, scilab-adv-cli.desktop, scilab-cli.desktop,
  scilab.desktop can be found desktop/. This follows the FreeDesktop Standards:
  "Desktop Entry Specification".

Change-Id: Ie8516e6048024995729a0bd13ed0688435f760b9

17 files changed:
scilab/CHANGES_5.3.X
scilab/Makefile.am
scilab/Makefile.in
scilab/desktop/README [moved from scilab/icons/README with 100% similarity]
scilab/desktop/puffin.icns [moved from scilab/icons/puffin.icns with 100% similarity]
scilab/desktop/puffin.ico [moved from scilab/icons/puffin.ico with 100% similarity]
scilab/desktop/puffin.png [moved from scilab/icons/puffin.png with 100% similarity]
scilab/desktop/puffin_128.xpm [moved from scilab/icons/puffin_128.xpm with 100% similarity]
scilab/desktop/puffin_256.xpm [moved from scilab/icons/puffin_256.xpm with 100% similarity]
scilab/desktop/puffin_32.xpm [moved from scilab/icons/puffin_32.xpm with 100% similarity]
scilab/desktop/puffin_48.xpm [moved from scilab/icons/puffin_48.xpm with 100% similarity]
scilab/desktop/scilab-adv-cli.desktop [new file with mode: 0644]
scilab/desktop/scilab-cli.desktop [new file with mode: 0644]
scilab/desktop/scilab.desktop [new file with mode: 0644]
scilab/desktop/scilab.icns [moved from scilab/icons/scilab.icns with 100% similarity]
scilab/desktop/scilab.ico [moved from scilab/icons/scilab.ico with 100% similarity]
scilab/desktop/scilab.xpm [moved from scilab/icons/scilab.xpm with 100% similarity]

index 850a47b..b7cb799 100644 (file)
@@ -77,6 +77,16 @@ Xcos:
 
 * bug 9175 fixed - Xcos: Sigbuilder, modify "Data bounds" in curve editor fails
 
+Packaging:
+==========
+
+* In the source tree, Scilab's icons moved from icons/ to desktop/
+
+* In the source tree, scilab-adv-cli.desktop, scilab-cli.desktop,
+  scilab.desktop can be found desktop/. This follows the FreeDesktop Standards:
+  "Desktop Entry Specification".
+
+
 Javasci:
 ========
 
index 6d948ba..794752d 100644 (file)
@@ -134,18 +134,25 @@ $(top_srcdir)/README_Windows.txt \
 $(top_builddir)/Version.incl
 
 iconsdir=$(pkgdatadir)/icons/
-icons_DATA = $(top_srcdir)/icons/scilab.xpm \
-$(top_srcdir)/icons/puffin_128.xpm \
-$(top_srcdir)/icons/puffin_256.xpm \
-$(top_srcdir)/icons/puffin_32.xpm \
-$(top_srcdir)/icons/puffin_48.xpm \
-$(top_srcdir)/icons/puffin.png \
-$(top_srcdir)/icons/puffin.icns \
-$(top_srcdir)/icons/scilab.icns
+icons_DATA = $(top_srcdir)/desktop/scilab.xpm \
+$(top_srcdir)/desktop/puffin_128.xpm \
+$(top_srcdir)/desktop/puffin_256.xpm \
+$(top_srcdir)/desktop/puffin_32.xpm \
+$(top_srcdir)/desktop/puffin_48.xpm \
+$(top_srcdir)/desktop/puffin.png \
+$(top_srcdir)/desktop/puffin.icns \
+$(top_srcdir)/desktop/scilab.icns
 
 valgrinddir=$(pkgdatadir)/tools/profiling
 valgrind_DATA = $(top_srcdir)/tools/profiling/valgrind.supp
 
+# Desktop file
+# Note that here, it is datadir and NOT pkgdatadir
+desktopdir = $(datadir)/applications
+desktop_DATA = $(top_srcdir)/desktop/scilab-adv-cli.desktop \
+$(top_srcdir)/desktop/scilab-cli.desktop \
+$(top_srcdir)/desktop/scilab.desktop
+
 macros:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli
        -@( cd $(top_builddir) ; \
        echo "$(top_builddir)/bin/scilab-cli -ns -f modules/functions/scripts/buildmacros/buildmacros.sce" ; \
index 5007d00..f2b2498 100644 (file)
@@ -123,9 +123,9 @@ CONFIG_CLEAN_FILES = modules/helptools/macros/xmlfiletohtml.sci \
 CONFIG_CLEAN_VPATH_FILES =
 @ENABLE_STATIC_TRUE@am__EXEEXT_1 = scilab-static-bin$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
-       "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(infofilesdir)" \
-       "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(rootdir)" \
-       "$(DESTDIR)$(valgrinddir)"
+       "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(iconsdir)" \
+       "$(DESTDIR)$(infofilesdir)" "$(DESTDIR)$(pkgconfigdir)" \
+       "$(DESTDIR)$(rootdir)" "$(DESTDIR)$(valgrinddir)"
 PROGRAMS = $(bin_PROGRAMS)
 am_call_scilab_c_OBJECTS = call_scilab_c-myprog.$(OBJEXT)
 call_scilab_c_OBJECTS = $(am_call_scilab_c_OBJECTS)
@@ -284,8 +284,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        install-pdf-recursive install-ps-recursive install-recursive \
        installcheck-recursive installdirs-recursive pdf-recursive \
        ps-recursive uninstall-recursive
-DATA = $(icons_DATA) $(infofiles_DATA) $(pkgconfig_DATA) $(root_DATA) \
-       $(valgrind_DATA)
+DATA = $(desktop_DATA) $(icons_DATA) $(infofiles_DATA) \
+       $(pkgconfig_DATA) $(root_DATA) $(valgrind_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -652,17 +652,25 @@ $(top_srcdir)/README_Windows.txt \
 $(top_builddir)/Version.incl
 
 iconsdir = $(pkgdatadir)/icons/
-icons_DATA = $(top_srcdir)/icons/scilab.xpm \
-$(top_srcdir)/icons/puffin_128.xpm \
-$(top_srcdir)/icons/puffin_256.xpm \
-$(top_srcdir)/icons/puffin_32.xpm \
-$(top_srcdir)/icons/puffin_48.xpm \
-$(top_srcdir)/icons/puffin.png \
-$(top_srcdir)/icons/puffin.icns \
-$(top_srcdir)/icons/scilab.icns
+icons_DATA = $(top_srcdir)/desktop/scilab.xpm \
+$(top_srcdir)/desktop/puffin_128.xpm \
+$(top_srcdir)/desktop/puffin_256.xpm \
+$(top_srcdir)/desktop/puffin_32.xpm \
+$(top_srcdir)/desktop/puffin_48.xpm \
+$(top_srcdir)/desktop/puffin.png \
+$(top_srcdir)/desktop/puffin.icns \
+$(top_srcdir)/desktop/scilab.icns
 
 valgrinddir = $(pkgdatadir)/tools/profiling
 valgrind_DATA = $(top_srcdir)/tools/profiling/valgrind.supp
+
+# Desktop file
+# Note that here, it is datadir and NOT pkgdatadir
+desktopdir = $(datadir)/applications
+desktop_DATA = $(top_srcdir)/desktop/scilab-adv-cli.desktop \
+$(top_srcdir)/desktop/scilab-cli.desktop \
+$(top_srcdir)/desktop/scilab.desktop
+
 LANGDOC = en_US fr_FR pt_BR ja_JP
 
 # Used for mac os x because it needs to remove the charset=UTF-8 because it is breaking the accents.
@@ -1110,6 +1118,26 @@ clean-libtool:
 
 distclean-libtool:
        -rm -f libtool config.lt
+install-desktopDATA: $(desktop_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
+       @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
+       done
+
+uninstall-desktopDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
 install-iconsDATA: $(icons_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
@@ -1529,7 +1557,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)$(iconsdir)" "$(DESTDIR)$(infofilesdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(rootdir)" "$(DESTDIR)$(valgrinddir)"; do \
+       for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(infofilesdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(rootdir)" "$(DESTDIR)$(valgrinddir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-recursive
@@ -1582,9 +1610,9 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-data-local install-iconsDATA \
-       install-infofilesDATA install-pkgconfigDATA install-rootDATA \
-       install-valgrindDATA
+install-data-am: install-data-local install-desktopDATA \
+       install-iconsDATA install-infofilesDATA install-pkgconfigDATA \
+       install-rootDATA install-valgrindDATA
 
 install-dvi: install-dvi-recursive
 
@@ -1633,9 +1661,9 @@ ps: ps-recursive
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-       uninstall-iconsDATA uninstall-infofilesDATA \
-       uninstall-pkgconfigDATA uninstall-rootDATA \
-       uninstall-valgrindDATA
+       uninstall-desktopDATA uninstall-iconsDATA \
+       uninstall-infofilesDATA uninstall-pkgconfigDATA \
+       uninstall-rootDATA uninstall-valgrindDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
        ctags-recursive install-am install-strip tags-recursive
@@ -1650,17 +1678,18 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
        distdir distuninstallcheck dvi dvi-am html html-am info \
        info-am 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-iconsDATA \
-       install-info install-info-am install-infofilesDATA install-man \
-       install-pdf install-pdf-am install-pkgconfigDATA install-ps \
-       install-ps-am install-rootDATA install-strip \
-       install-valgrindDATA installcheck installcheck-am installdirs \
-       installdirs-am maintainer-clean 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-iconsDATA \
+       install-data-local install-desktopDATA install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-iconsDATA install-info install-info-am \
+       install-infofilesDATA install-man install-pdf install-pdf-am \
+       install-pkgconfigDATA install-ps install-ps-am \
+       install-rootDATA install-strip install-valgrindDATA \
+       installcheck installcheck-am installdirs installdirs-am \
+       maintainer-clean 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-desktopDATA uninstall-iconsDATA \
        uninstall-infofilesDATA uninstall-pkgconfigDATA \
        uninstall-rootDATA uninstall-valgrindDATA
 
similarity index 100%
rename from scilab/icons/README
rename to scilab/desktop/README
diff --git a/scilab/desktop/scilab-adv-cli.desktop b/scilab/desktop/scilab-adv-cli.desktop
new file mode 100644 (file)
index 0000000..d33a3df
--- /dev/null
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Comment=Scientific software package for numerical computations
+Comment[fr]=Logiciel scientifique de calcul numérique
+Comment[de]=eine Wissenschaftssoftware für numerische Berechnungen
+Exec=scilab-cli
+GenericName=Scientific Software Package
+GenericName[fr]=Logiciel de calcul numérique
+GenericName[de]=Wissenschaftssoftware
+Icon=/usr/share/scilab-cli/icons/scilab.xpm
+Name=Scilab advanced CLI
+Name[de]=Scilab advanced CLI
+StartupNotify=false
+Terminal=true
+Type=Application
+Categories=Education;Science;Math;Development;Physics;
diff --git a/scilab/desktop/scilab-cli.desktop b/scilab/desktop/scilab-cli.desktop
new file mode 100644 (file)
index 0000000..a20513c
--- /dev/null
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Comment=Scientific software package for numerical computations
+Comment[fr]=Logiciel scientifique de calcul numérique
+Comment[de]=eine Wissenschaftssoftware für numerische Berechnungen
+Exec=scilab-cli
+GenericName=Scientific Software Package
+GenericName[fr]=Logiciel de calcul numérique
+GenericName[de]=Wissenschaftssoftware
+Icon=/usr/share/scilab-cli/icons/scilab.xpm
+Name=Scilab CLI
+Name[de]=Scilab CLI
+StartupNotify=false
+Terminal=true
+Type=Application
+Categories=Education;Science;Math;Development;Physics;
diff --git a/scilab/desktop/scilab.desktop b/scilab/desktop/scilab.desktop
new file mode 100644 (file)
index 0000000..d9b5b2d
--- /dev/null
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Comment=Scientific software package for numerical computations
+Comment[fr]=Logiciel scientifique de calcul numérique
+Comment[de]=eine Wissenschaftssoftware für numerische Berechnungen
+Exec=scilab
+GenericName=Scientific Software Package
+GenericName[fr]=Logiciel de calcul numérique
+GenericName[de]=Wissenschaftssoftware
+Icon=/usr/share/scilab/icons/scilab.xpm
+Name=Scilab
+Name[de]=Scilab
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Education;Science;Math;Development;Physics;