Remove the spec file stuff, and the zip script for creating zip files forGNOME_ICON_THEME_2_11_4

2005-07-02  Rodney Dawes  <dobey@novell.com>

	* Makefile.am (EXTRA_DIST): Remove the spec file stuff, and the
	zip script for creating zip files for win32
	(DISTCLEANFILES): Remove po/.intltool-merge-cache
	(MAINTAINERCLEANFILES): Remove po/ stuff and add mkinstalldirs

	* NEWS: Updated for release

	* configure.in: Up version to 2.11.4
	Remove check for win32 and allocation of OS_WIN32 Makefile variable
	Add AC_PROG_LN_S so that $(LN_S) can be used for symlinks
	Remove gnome-icon-theme.spec and gnome-icon-theme-zip from the
	AC_CONFIG_FILES macro call

	* gnome-icon-theme-zip.in:
	* gnome-icon-theme.spec.in: Removed these two files

	* 16x16/stock/net/Makefile.am:
	* 24x24/stock/net/Makefile.am:
	* 48x48/stock/net/Makefile.am: Use $(LN_S) instead of calling ln -s
	directly, so that we work better on win32

10 files changed, 59 insertions, 140 deletions

diff --git a/16x16/stock/net/Makefile.am b/16x16/stock/net/Makefile.am
index 19fc82c21..a8e692262 100644
--- a/16x16/stock/net/Makefile.am
+++ b/16x16/stock/net/Makefile.am
@@ -69,10 +69,6 @@ EXTRA_DIST = $(icon_DATA)
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(icondir)/../../filesystems
-if OS_WIN32
-	$(INSTALL) stock_shared-by-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-locally-shared.png
-	$(INSTALL) stock_shared-to-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-share-private.png
-else
-	ln -sf $(icondir)/stock_shared-by-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-locally-shared.png
-	ln -sf $(icondir)/stock_shared-to-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-share-private.png
-endif
+	$(LN_S) $(icondir)/stock_shared-by-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-locally-shared.png
+	$(LN_S) $(icondir)/stock_shared-to-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-share-private.png
+
diff --git a/24x24/stock/net/Makefile.am b/24x24/stock/net/Makefile.am
index eff17e2b3..0ca70ece3 100644
--- a/24x24/stock/net/Makefile.am
+++ b/24x24/stock/net/Makefile.am
@@ -63,10 +63,5 @@ EXTRA_DIST = $(icon_DATA)
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(icondir)/../../filesystems
-if OS_WIN32
-	$(INSTALL) stock_shared-by-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-locally-shared.png
-	$(INSTALL) stock_shared-to-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-share-private.png
-else
-	ln -sf $(icondir)/stock_shared-by-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-locally-shared.png
-	ln -sf $(icondir)/stock_shared-to-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-share-private.png
-endif
+	$(LN_S) $(icondir)/stock_shared-by-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-locally-shared.png
+	$(LN_S) $(icondir)/stock_shared-to-me.png $(DESTDIR)$(icondir)/../../filesystems/gnome-fs-share-private.png
diff --git a/48x48/mimetypes/Makefile.am b/48x48/mimetypes/Makefile.am
index 27dd37cc7..d289c6f95 100644
--- a/48x48/mimetypes/Makefile.am
+++ b/48x48/mimetypes/Makefile.am
@@ -204,36 +204,18 @@ icon_DATA =\
 	$(NULL)
 
 install-data-hook:
-if OS_WIN32
-	echo Installing backwards compat copies
-	$(INSTALL) gnome-mime-application-x-qw.png $(DESTDIR)$(icondir)/gnome-mime-application-qif.png
-	$(INSTALL) gnome-mime-application-x-trash.png $(DESTDIR)$(icondir)/gnome-mime-application-x-backup.png
-	$(INSTALL) gnome-mime-application-x-core.png $(DESTDIR)$(icondir)/gnome-mime-application-x-core-file.png
-	$(INSTALL) gnome-mime-application-x-desktop.png $(DESTDIR)$(icondir)/gnome-mime-application-x-gnome-app-info.png
-	$(INSTALL) gnome-mime-application-x-class-file.png $(DESTDIR)$(icondir)/gnome-mime-application-x-java-byte-code.png
-	$(INSTALL) gnome-mime-application-x-object.png $(DESTDIR)$(icondir)/gnome-mime-application-x-object-file.png
-	$(INSTALL) gnome-mime-application-smil.png $(DESTDIR)$(icondir)/gnome-mime-application-x-smil.png
-	$(INSTALL) gnome-mime-audio-midi.png $(DESTDIR)$(icondir)/gnome-mime-audio-x-midi.png
-	$(INSTALL) gnome-mime-image-svg+xml.png $(DESTDIR)$(icondir)/gnome-mime-image-svg.png
-	$(INSTALL) gnome-mime-text-x-chdr.png $(DESTDIR)$(icondir)/gnome-mime-text-x-c-header.png
-	$(INSTALL) gnome-mime-text-x-csrc.png $(DESTDIR)$(icondir)/gnome-mime-text-x-c.png
-	$(INSTALL) gnome-mime-text-x-c++src.png $(DESTDIR)$(icondir)/gnome-mime-text-x-c++.png
-	$(INSTALL) gnome-mime-application-x-shellscript.png $(DESTDIR)$(icondir)/gnome-mime-text-x-sh.png
-else
-	echo Installing backwards compat symlinks
-	ln -sf gnome-mime-application-x-qw.png $(DESTDIR)$(icondir)/gnome-mime-application-qif.png
-	ln -sf gnome-mime-application-x-trash.png $(DESTDIR)$(icondir)/gnome-mime-application-x-backup.png
-	ln -sf gnome-mime-application-x-core.png $(DESTDIR)$(icondir)/gnome-mime-application-x-core-file.png
-	ln -sf gnome-mime-application-x-desktop.png $(DESTDIR)$(icondir)/gnome-mime-application-x-gnome-app-info.png
-	ln -sf gnome-mime-application-x-class-file.png $(DESTDIR)$(icondir)/gnome-mime-application-x-java-byte-code.png
-	ln -sf gnome-mime-application-x-object.png $(DESTDIR)$(icondir)/gnome-mime-application-x-object-file.png
-	ln -sf gnome-mime-application-smil.png $(DESTDIR)$(icondir)/gnome-mime-application-x-smil.png
-	ln -sf gnome-mime-audio-midi.png $(DESTDIR)$(icondir)/gnome-mime-audio-x-midi.png
-	ln -sf gnome-mime-image-svg+xml.png $(DESTDIR)$(icondir)/gnome-mime-image-svg.png
-	ln -sf gnome-mime-text-x-chdr.png $(DESTDIR)$(icondir)/gnome-mime-text-x-c-header.png
-	ln -sf gnome-mime-text-x-csrc.png $(DESTDIR)$(icondir)/gnome-mime-text-x-c.png
-	ln -sf gnome-mime-text-x-c++src.png $(DESTDIR)$(icondir)/gnome-mime-text-x-c++.png
-	ln -sf gnome-mime-application-x-shellscript.png $(DESTDIR)$(icondir)/gnome-mime-text-x-sh.png
-endif
+	$(LN_S) gnome-mime-application-x-qw.png $(DESTDIR)$(icondir)/gnome-mime-application-qif.png
+	$(LN_S) gnome-mime-application-x-trash.png $(DESTDIR)$(icondir)/gnome-mime-application-x-backup.png
+	$(LN_S) gnome-mime-application-x-core.png $(DESTDIR)$(icondir)/gnome-mime-application-x-core-file.png
+	$(LN_S) gnome-mime-application-x-desktop.png $(DESTDIR)$(icondir)/gnome-mime-application-x-gnome-app-info.png
+	$(LN_S) gnome-mime-application-x-class-file.png $(DESTDIR)$(icondir)/gnome-mime-application-x-java-byte-code.png
+	$(LN_S) gnome-mime-application-x-object.png $(DESTDIR)$(icondir)/gnome-mime-application-x-object-file.png
+	$(LN_S) gnome-mime-application-smil.png $(DESTDIR)$(icondir)/gnome-mime-application-x-smil.png
+	$(LN_S) gnome-mime-audio-midi.png $(DESTDIR)$(icondir)/gnome-mime-audio-x-midi.png
+	$(LN_S) gnome-mime-image-svg+xml.png $(DESTDIR)$(icondir)/gnome-mime-image-svg.png
+	$(LN_S) gnome-mime-text-x-chdr.png $(DESTDIR)$(icondir)/gnome-mime-text-x-c-header.png
+	$(LN_S) gnome-mime-text-x-csrc.png $(DESTDIR)$(icondir)/gnome-mime-text-x-c.png
+	$(LN_S) gnome-mime-text-x-c++src.png $(DESTDIR)$(icondir)/gnome-mime-text-x-c++.png
+	$(LN_S) gnome-mime-application-x-shellscript.png $(DESTDIR)$(icondir)/gnome-mime-text-x-sh.png
 
 EXTRA_DIST = $(icon_DATA)
diff --git a/ChangeLog b/ChangeLog
index 5d2c050b2..89677356d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2005-07-02  Rodney Dawes  <dobey@novell.com>
+
+	* Makefile.am (EXTRA_DIST): Remove the spec file stuff, and the
+	zip script for creating zip files for win32
+	(DISTCLEANFILES): Remove po/.intltool-merge-cache
+	(MAINTAINERCLEANFILES): Remove po/ stuff and add mkinstalldirs
+
+	* NEWS: Updated for release
+
+	* configure.in: Up version to 2.11.4
+	Remove check for win32 and allocation of OS_WIN32 Makefile variable
+	Add AC_PROG_LN_S so that $(LN_S) can be used for symlinks
+	Remove gnome-icon-theme.spec and gnome-icon-theme-zip from the
+	AC_CONFIG_FILES macro call
+
+	* gnome-icon-theme-zip.in:
+	* gnome-icon-theme.spec.in: Removed these two files
+
+	* 16x16/stock/net/Makefile.am:
+	* 24x24/stock/net/Makefile.am:
+	* 48x48/stock/net/Makefile.am: Use $(LN_S) instead of calling ln -s
+	directly, so that we work better on win32
+
 2005-07-01  Rodney Dawes  <dobey@novell.com>
 
 	* 16x16/mimetypes/Makefile.am: Remove the text/plain and text/plaintext
diff --git a/Makefile.am b/Makefile.am
index b13b3bcab..542a7f61e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,10 +21,7 @@ EXTRA_DIST=				\
 	intltool-update.in 		\
 	intltool-merge.in 		\
 	intltool-extract.in		\
-	gnome-icon-theme.spec		\
-	gnome-icon-theme.spec.in	\
 	gnome-icon-theme.pc.in		\
-	gnome-icon-theme-zip.in		\
 	mkinstalldirs
 
 # we don't want to install mo files, all translations are already stored
@@ -56,7 +53,6 @@ CLEANFILES = 				\
 	index.theme
 
 DISTCLEANFILES = 			\
-	po/.intltool-merge-cache	\
 	intltool-extract		\
 	intltool-merge			\
 	intltool-update
@@ -70,6 +66,5 @@ MAINTAINERCLEANFILES =			\
 	intltool-merge.in		\
 	intltool-update.in		\
 	missing				\
-	po/Makefile.in.in		\
-	po/$(GETTEXT_PACKAGE).pot
+	mkinstalldirs
 
diff --git a/NEWS b/NEWS
index c2c7f01ba..b339eab52 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,16 @@
-Version 2.10.1
+Version 2.11.4
+
+Changes since 2.10.1
+
+* More icons merged in from GPerfection theme (Jakub Steiner)
+* More conversion of emblems to SVG (Jakub Steiner)
+* New icon for Evolution (Jakub Steiner)
+* Support for Win32 (Tor Lillqvist, Rodney Dawes)
+* New stock_database icon at 16 and 24 px sizes
+	-- bug #132769 (Jakub Steiner)
+* Fix python mime type icon
+  -- bug #167182 (Jakub Steiner)
+* New and updated translations [gl, fa, rw, th, vi, xh, zh_TW]
 
 Changes since 2.10.0
 
diff --git a/configure.in b/configure.in
index 8f265c13a..2452ee0d2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,24 +1,14 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.53)
 
-AC_INIT([gnome-icon-theme], [2.10.1],
+AC_INIT([gnome-icon-theme], [2.11.4],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-icon-theme])
 AC_CONFIG_SRCDIR(index.theme.in)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 AC_PROG_INTLTOOL
-
-AC_CANONICAL_HOST
-case "$host" in
-  *-*-mingw*)
-    os_win32=yes
-    ;;
-  *)
-    os_win32=no
-    ;;
-esac
-AM_CONDITIONAL(OS_WIN32, [test "$os_win32" = "yes"])
+AC_PROG_LN_S
 
 GETTEXT_PACKAGE="${PACKAGE}"
 AC_SUBST(GETTEXT_PACKAGE)
@@ -43,9 +33,7 @@ AM_CONDITIONAL(ENABLE_HICOLOR_CHECK, test x$enable_hicolor_check = xyes)
 
 AC_CONFIG_FILES([
 Makefile
-gnome-icon-theme.spec
 gnome-icon-theme.pc
-gnome-icon-theme-zip
 12x12/Makefile
 16x16/Makefile
 24x24/Makefile
diff --git a/gnome-icon-theme-zip.in b/gnome-icon-theme-zip.in
deleted file mode 100755
index b119c6908..000000000
--- a/gnome-icon-theme-zip.in
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# Build zipfiles for gnome-icon-theme on Win32. Run after make
-# install.
-
-ZIP=/tmp/gnome-icon-theme-@VERSION@.zip
-DEVZIP=/tmp/gnome-icon-theme-dev-@VERSION@.zip
-
-cd @prefix@
-rm $ZIP
-
-zip -q -r $ZIP -@ <<EOF
-share/icons/gnome/index.theme
-share/icons/gnome/12x12
-share/icons/gnome/16x16
-share/icons/gnome/24x24
-share/icons/gnome/32x32
-share/icons/gnome/36x36
-share/icons/gnome/48x48
-share/icons/gnome/72x72
-share/icons/gnome/96x96
-share/icons/gnome/192x192
-share/icons/gnome/scalable
-share/icons/hicolor/16x16
-share/icons/hicolor/24x24
-share/icons/hicolor/32x32
-share/icons/hicolor/36x36
-share/icons/hicolor/48x48
-share/icons/hicolor/72x72
-share/icons/hicolor/96x96
-share/icons/hicolor/192x192
-share/icons/hicolor/scalable
-EOF
-
-rm $DEVZIP
-zip -q $DEVZIP -@ <<EOF
-lib/pkgconfig/gnome-icon-theme.pc
-EOF
diff --git a/gnome-icon-theme.spec.in b/gnome-icon-theme.spec.in
deleted file mode 100644
index 9a5c890af..000000000
--- a/gnome-icon-theme.spec.in
+++ /dev/null
@@ -1,36 +0,0 @@
-Summary: The base GNOME icon theme
-Name: gnome-icon-theme
-Version: @VERSION@
-Release: 1
-License: GPL
-Group: User Interface/Desktop
-Source: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildArch: noarch
-
-%description
-The base GNOME icon theme
-
-%prep
-%setup
-
-%build
-%configure
-make
-
-%install
-rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-, root, root)
-%{_datadir}/icons/*
-%doc ChangeLog COPYING NEWS
-
-%changelog
-* Sun Jan 26 2003 Yanko Kaneti <yaneti@declera.com>
-- First spec.in
-
diff --git a/scalable/apps/.cvsignore b/scalable/apps/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/scalable/apps/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in