diff -Naur gnome-backgrounds-2.24.0/Makefile.am gnome-backgrounds-2.24.0.new/Makefile.am --- gnome-backgrounds-2.24.0/Makefile.am 2008-09-23 04:55:58.000000000 -0500 +++ gnome-backgrounds-2.24.0.new/Makefile.am 2009-01-06 23:21:00.412598110 -0600 @@ -1,4 +1,4 @@ -SUBDIRS = abstract nature po +SUBDIRS = abstract gware nature po EXTRA_DIST = \ MAINTAINERS diff -Naur gnome-backgrounds-2.24.0/Makefile.in gnome-backgrounds-2.24.0.new/Makefile.in --- gnome-backgrounds-2.24.0/Makefile.in 2008-09-23 05:00:12.000000000 -0500 +++ gnome-backgrounds-2.24.0.new/Makefile.in 2009-01-06 23:21:14.808442768 -0600 @@ -194,7 +194,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = abstract nature po +SUBDIRS = abstract gware nature po EXTRA_DIST = \ MAINTAINERS diff -Naur gnome-backgrounds-2.24.0/configure gnome-backgrounds-2.24.0.new/configure --- gnome-backgrounds-2.24.0/configure 2008-09-23 05:00:10.000000000 -0500 +++ gnome-backgrounds-2.24.0.new/configure 2009-01-06 23:22:53.595448583 -0600 @@ -6519,7 +6519,7 @@ -ac_config_files="$ac_config_files Makefile abstract/Makefile nature/Makefile po/Makefile.in" +ac_config_files="$ac_config_files Makefile abstract/Makefile gware/Makefile nature/Makefile po/Makefile.in" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -7171,6 +7171,7 @@ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "abstract/Makefile") CONFIG_FILES="$CONFIG_FILES abstract/Makefile" ;; + "gware/Makefile") CONFIG_FILES="$CONFIG_FILES gware/Makefile" ;; "nature/Makefile") CONFIG_FILES="$CONFIG_FILES nature/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; diff -Naur gnome-backgrounds-2.24.0/configure.in gnome-backgrounds-2.24.0.new/configure.in --- gnome-backgrounds-2.24.0/configure.in 2008-09-23 04:56:31.000000000 -0500 +++ gnome-backgrounds-2.24.0.new/configure.in 2009-01-06 23:23:09.251291178 -0600 @@ -16,6 +16,7 @@ AC_OUTPUT([ Makefile abstract/Makefile +gware/Makefile nature/Makefile po/Makefile.in ]) diff -Naur gnome-backgrounds-2.24.0/gware/Makefile.am gnome-backgrounds-2.24.0.new/gware/Makefile.am --- gnome-backgrounds-2.24.0/gware/Makefile.am 1969-12-31 18:00:00.000000000 -0600 +++ gnome-backgrounds-2.24.0.new/gware/Makefile.am 2009-01-06 23:19:48.781307408 -0600 @@ -0,0 +1,22 @@ +backgrounddir = $(datadir)/pixmaps/backgrounds/gnome/gware + +background_DATA = \ + gware.png + + +metadata_in_files = gnome-gware.xml.in +metadatadir = $(datadir)/gnome-background-properties +metadata_DATA = $(metadata_in_files:.xml.in=.xml) +@INTLTOOL_XML_RULE@ + +noinst_DATA = gnome-gware.xml.in +CLEANFILES = gnome-gware.xml gnome-gware.xml.in + +EXTRA_DIST = $(background_DATA) gnome-gware.xml.in.in + +gnome-gware.xml.in: gnome-gware.xml.in.in Makefile + sed -e 's^\@datadir\@^$(datadir)^g' < $(srcdir)/gnome-gware.xml.in.in > gnome-gware.xml.in.tmp \ + && mv gnome-gware.xml.in.tmp gnome-gware.xml.in + +MAINTAINERCLEANFILES = \ + Makefile.in diff -Naur gnome-backgrounds-2.24.0/gware/Makefile.in gnome-backgrounds-2.24.0.new/gware/Makefile.in --- gnome-backgrounds-2.24.0/gware/Makefile.in 1969-12-31 18:00:00.000000000 -0600 +++ gnome-backgrounds-2.24.0.new/gware/Makefile.in 2009-01-06 23:19:13.681671625 -0600 @@ -0,0 +1,403 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +subdir = gware +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(backgrounddir)" \ + "$(DESTDIR)$(metadatadir)" +backgroundDATA_INSTALL = $(INSTALL_DATA) +metadataDATA_INSTALL = $(INSTALL_DATA) +DATA = $(background_DATA) $(metadata_DATA) $(noinst_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ +INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ +INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ +INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ +INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ +INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ +INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ +INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ +INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ +INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ +INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ +INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +backgrounddir = $(datadir)/pixmaps/backgrounds/gnome/gware +background_DATA = \ + gware.png + +metadata_in_files = gnome-gware.xml.in +metadatadir = $(datadir)/gnome-background-properties +metadata_DATA = $(metadata_in_files:.xml.in=.xml) +noinst_DATA = gnome-gware.xml.in +CLEANFILES = gnome-gware.xml gnome-gware.xml.in +EXTRA_DIST = $(background_DATA) gnome-gware.xml.in.in +MAINTAINERCLEANFILES = \ + Makefile.in + +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gware/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gware/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-backgroundDATA: $(background_DATA) + @$(NORMAL_INSTALL) + test -z "$(backgrounddir)" || $(MKDIR_P) "$(DESTDIR)$(backgrounddir)" + @list='$(background_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(backgroundDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(backgrounddir)/$$f'"; \ + $(backgroundDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(backgrounddir)/$$f"; \ + done + +uninstall-backgroundDATA: + @$(NORMAL_UNINSTALL) + @list='$(background_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(backgrounddir)/$$f'"; \ + rm -f "$(DESTDIR)$(backgrounddir)/$$f"; \ + done +install-metadataDATA: $(metadata_DATA) + @$(NORMAL_INSTALL) + test -z "$(metadatadir)" || $(MKDIR_P) "$(DESTDIR)$(metadatadir)" + @list='$(metadata_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(metadataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(metadatadir)/$$f'"; \ + $(metadataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(metadatadir)/$$f"; \ + done + +uninstall-metadataDATA: + @$(NORMAL_UNINSTALL) + @list='$(metadata_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(metadatadir)/$$f'"; \ + rm -f "$(DESTDIR)$(metadatadir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(backgrounddir)" "$(DESTDIR)$(metadatadir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-backgroundDATA install-metadataDATA + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-backgroundDATA uninstall-metadataDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-backgroundDATA install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-metadataDATA install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am \ + uninstall-backgroundDATA uninstall-metadataDATA + +@INTLTOOL_XML_RULE@ + +gnome-gware.xml.in: gnome-gware.xml.in.in Makefile + sed -e 's^\@datadir\@^$(datadir)^g' < $(srcdir)/gnome-gware.xml.in.in > gnome-gware.xml.in.tmp \ + && mv gnome-gware.xml.in.tmp gnome-gware.xml.in +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Naur gnome-backgrounds-2.24.0/gware/gnome-gware.xml.in.in gnome-backgrounds-2.24.0.new/gware/gnome-gware.xml.in.in --- gnome-backgrounds-2.24.0/gware/gnome-gware.xml.in.in 1969-12-31 18:00:00.000000000 -0600 +++ gnome-backgrounds-2.24.0.new/gware/gnome-gware.xml.in.in 2009-01-06 23:17:28.618717129 -0600 @@ -0,0 +1,11 @@ + + + + + <_name>gware + @datadir@/pixmaps/backgrounds/gnome/gware/gware.png + solid + #1166AA + centered + +