[gnumeric: 1/2] Actually drop gnumeric.keys




commit 9831621a8374d095e66675024018bc61c28575be
Author: Pino Toscano <toscano pino tiscali it>
Date:   Mon Oct 19 20:47:29 2020 +0000

    Actually drop gnumeric.keys
    
    Commit 714ab40e42b04d1af074a3019d7ef91167469c12 makes it not used
    anymore, so it is effectively dead.

 .gitignore                                        |   1 -
 Makefile.am                                       |   3 +-
 configure.ac                                      |   1 -
 gnumeric.keys.in                                  | 132 ----------------------
 icons/Makefile.am                                 |  23 +---
 icons/gnome-application-vnd.lotus-1-2-3.png       | Bin 3066 -> 0 bytes
 icons/gnome-application-x-applix-spreadsheet.png  | Bin 3729 -> 0 bytes
 icons/gnome-application-x-generic-spreadsheet.png | Bin 2310 -> 0 bytes
 icons/gnome-application-x-gnumeric.png            | Bin 1913 -> 0 bytes
 icons/gnome-application-x-xls.png                 | Bin 2137 -> 0 bytes
 icons/gnumeric-about.png                          | Bin 101650 -> 0 bytes
 icons/orient-horizontal.png                       | Bin 522 -> 0 bytes
 icons/orient-vertical.png                         | Bin 537 -> 0 bytes
 icons/stf-druid.png                               | Bin 3964 -> 0 bytes
 src/Makefile.am                                   |   1 -
 15 files changed, 5 insertions(+), 156 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8e41fad34..955ce08f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,6 @@ missing
 mkinstalldirs
 ylwrap
 gnumeric.appdata.xml
-gnumeric.keys
 gnumeric.spec
 gnumeric.desktop
 gnumeric.desktop.in
diff --git a/Makefile.am b/Makefile.am
index 260cd2364..ce847aa3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ XML_I18N_XML_KIND = --pass-through
 # We used to distribute old ChangeLog files too.
 change_logs = ChangeLog
 
-CLEANFILES = gnumeric.desktop gnumeric.keys gnumeric.appdata.xml
+CLEANFILES = gnumeric.desktop gnumeric.appdata.xml
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update $(pkgconfig_DATA)
 
 # Flags for distcheck, mostly to install things that nominally go under the
@@ -25,7 +25,6 @@ EXTRA_DIST = \
        COPYING COPYING-gpl2 COPYING-gpl3 \
        gnumeric.appdata.xml.in \
        gnumeric.desktop.in     \
-       gnumeric.keys.in        \
        gnumeric.mime           \
        gnumeric.spec           \
        gnumeric.xsd            \
diff --git a/configure.ac b/configure.ac
index 95b60c99d..5fb99a72e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1167,7 +1167,6 @@ dnl
 dnl These are changed in gutils.c for WIN32 packages
 AC_SUBST(gnumeric_datadir, '${datadir}/gnumeric/${VERSION}')
 AC_SUBST(gnumeric_libdir, '${libdir}/gnumeric/${VERSION}')
-AC_SUBST(gnumeric_icondir, '${datadir}/pixmaps/gnumeric')
 AC_SUBST(gnumeric_localedir, '${prefix}/${DATADIRNAME}/locale')
 dnl
 AC_SUBST(gnumeric_plugindir, '${gnumeric_libdir}/plugins')
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 4073fd84a..bea6e1d68 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,24 +1,6 @@
 SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256
 
-# keep in sync with gnumeric/src/libgnumeric.c:gnm_common_init
-mimeicondir = $(datadir)/pixmaps
-mimeicon_DATA = gnome-application-x-gnumeric.png \
-               gnome-application-x-xls.png \
-               gnome-application-x-applix-spreadsheet.png \
-               gnome-application-vnd.lotus-1-2-3.png \
-               gnome-application-x-generic-spreadsheet.png \
-              win32-gnumeric.ico
-
-iconsdir = $(gnumeric_icondir)
-icons_DATA = $(mimeicon_DATA)
-
-# Not currently used:
-#      orient-horizontal.png   \
-#      orient-vertical.png     \
-#      gnumeric-about.png      \
-#      stf-druid.png
-
-EXTRA_DIST = $(icons_DATA) $(mimeicon_DATA) fake-index-theme
+EXTRA_DIST = fake-index-theme win32-gnumeric.ico
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
@@ -28,6 +10,9 @@ fake_index_theme_target += install-fake-index-theme
 
 install-fake-index-theme: fake-index-theme
        install -D -m 0644 fake-index-theme $(datadir)/icons/hicolor/index.theme
+
+winicondir = $(datadir)/pixmaps
+winicon_DATA = win32-gnumeric.ico
 endif
 
 install-data-hook: update-icon-cache $(fake_index_theme_target)
diff --git a/src/Makefile.am b/src/Makefile.am
index 32934ded7..8b9d88980 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -737,7 +737,6 @@ gnumeric-paths.h: Makefile
        echo '#define GNUMERIC_SYSCONFDIR       "$(sysconfdir)"'; \
        echo '#define GNUMERIC_DATADIR          "$(gnumeric_datadir)"'; \
        echo '#define GNUMERIC_LIBDIR           "$(gnumeric_libdir)"'; \
-       echo '#define GNUMERIC_ICONDIR          "$(gnumeric_icondir)"'; \
        echo '#define GNUMERIC_LOCALEDIR        "$(gnumeric_localedir)"'; \
        echo '#define GNUMERIC_EXTERNPLUGINDIR          "$(gnumeric_externplugindir)"'; \
        echo ''; \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]