]> git.pld-linux.org Git - packages/control-center.git/commitdiff
projects / packages / control-center.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6be6ba2)
53e3d628a0d53a4b74e1ae8d8cb057ff control-center-1.4.0.1.tar.gz
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Sun, 1 Apr 2001 18:44:13 +0000 (18:44 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    control-center-applnk.patch -> 1.5
    control-center-macros.patch -> 1.1

control-center-applnk.patch patch | blob | blame | history
control-center-macros.patch [new file with mode: 0644] patch | blob

diff --git a/control-center-applnk.patch b/control-center-applnk.patch
index f9dc04cf562efb3c8ef459925e78804c99cbe7fd..0397afc42860fc1bbb31541dcc2dd7b5c5a35b00 100644 (file)
--- a/control-center-applnk.patch
+++ b/control-center-applnk.patch
@@ -1,15 +1,15 @@
-diff -Nru control-center-1.2.3/capplets/background-properties/Makefile.am control-center-1.2.3.new/capplets/background-properties/Makefile.am
---- control-center-1.2.3/capplets/background-properties/Makefile.am    Tue Feb 20 02:32:44 2001
-+++ control-center-1.2.3.new/capplets/background-properties/Makefile.am        Tue Feb 20 02:33:18 2001
-@@ -26,4 +26,4 @@
- sys_DATA = background-properties.desktop 
+diff -urN control-center-1.4.0.1.org/capplets/background-properties/Makefile.am control-center-1.4.0.1/capplets/background-properties/Makefile.am
+--- control-center-1.4.0.1.org/capplets/background-properties/Makefile.am      Sun Apr  1 18:49:14 2001
++++ control-center-1.4.0.1/capplets/background-properties/Makefile.am  Sun Apr  1 18:52:37 2001
+@@ -28,4 +28,4 @@
+ @XML_I18N_MERGE_DESKTOP_RULE@
  
  install-data-local:
 -      $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/background-properties.desktop
 +      $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/background-properties.desktop
-diff -Nru control-center-1.2.3/capplets/desktop-links/Makefile.am control-center-1.2.3.new/capplets/desktop-links/Makefile.am
---- control-center-1.2.3/capplets/desktop-links/Makefile.am    Tue Feb 20 02:32:44 2001
-+++ control-center-1.2.3.new/capplets/desktop-links/Makefile.am        Tue Feb 20 02:33:37 2001
+diff -urN control-center-1.4.0.1.org/capplets/desktop-links/Makefile.am control-center-1.4.0.1/capplets/desktop-links/Makefile.am
+--- control-center-1.4.0.1.org/capplets/desktop-links/Makefile.am      Sun Apr  1 18:49:14 2001
++++ control-center-1.4.0.1/capplets/desktop-links/Makefile.am  Sun Apr  1 18:52:37 2001
 @@ -6,7 +6,7 @@
  Sessiondir    = $(ccenterdir)/Session
  Documentsdir  = $(ccenterdir)/Documents
@@ -19,110 +19,761 @@ diff -Nru control-center-1.2.3/capplets/desktop-links/Makefile.am control-center
  Multimediadirp        = $(paneldir)/Multimedia
  Desktopdirp   = $(paneldir)/Desktop
  UIOptionsdirp   = $(paneldir)/UIOptions
-diff -Nru control-center-1.2.3/capplets/gnome-edit-properties/Makefile.am control-center-1.2.3.new/capplets/gnome-edit-properties/Makefile.am
---- control-center-1.2.3/capplets/gnome-edit-properties/Makefile.am    Tue Feb 20 02:32:44 2001
-+++ control-center-1.2.3.new/capplets/gnome-edit-properties/Makefile.am        Tue Feb 20 02:33:59 2001
-@@ -21,4 +21,4 @@
- sys_DATA = gnome-edit-properties.desktop
+diff -urN control-center-1.4.0.1.org/capplets/file-types/Makefile.am control-center-1.4.0.1/capplets/file-types/Makefile.am
+--- control-center-1.4.0.1.org/capplets/file-types/Makefile.am Sun Apr  1 18:49:14 2001
++++ control-center-1.4.0.1/capplets/file-types/Makefile.am     Sun Apr  1 18:54:13 2001
+@@ -42,7 +42,7 @@
+ sys_in_files = file-types-capplet.desktop.in 
+ sys_DATA = $(sys_in_files:.desktop.in=.desktop)
+ 
+-settingsdir = $(datadir)/gnome/apps/Settings
++settingsdir = $(datadir)/applnk/Settings
+ settings_DATA = $(sys_DATA)
+ 
+ @XML_I18N_MERGE_DESKTOP_RULE@
+diff -urN control-center-1.4.0.1.org/capplets/file-types/Makefile.in control-center-1.4.0.1/capplets/file-types/Makefile.in
+--- control-center-1.4.0.1.org/capplets/file-types/Makefile.in Sun Apr  1 18:49:14 2001
++++ control-center-1.4.0.1/capplets/file-types/Makefile.in     Thu Jan  1 01:00:00 1970
+@@ -1,523 +0,0 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+-
+-# Copyright (C) 1994, 1995-8, 1999 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.
+-
+-
+-SHELL = @SHELL@
+-
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+-VPATH = @srcdir@
+-prefix = @prefix@
+-exec_prefix = @exec_prefix@
+-
+-bindir = @bindir@
+-sbindir = @sbindir@
+-libexecdir = @libexecdir@
+-datadir = @datadir@
+-sysconfdir = @sysconfdir@
+-sharedstatedir = @sharedstatedir@
+-localstatedir = @localstatedir@
+-libdir = @libdir@
+-infodir = @infodir@
+-mandir = @mandir@
+-includedir = @includedir@
+-oldincludedir = /usr/include
+-
+-DESTDIR =
+-
+-pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkgincludedir = $(includedir)/@PACKAGE@
+-
+-top_builddir = ../..
+-
+-ACLOCAL = @ACLOCAL@
+-AUTOCONF = @AUTOCONF@
+-AUTOMAKE = @AUTOMAKE@
+-AUTOHEADER = @AUTOHEADER@
+-
+-INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-transform = @program_transform_name@
+-
+-NORMAL_INSTALL = :
+-PRE_INSTALL = :
+-POST_INSTALL = :
+-NORMAL_UNINSTALL = :
+-PRE_UNINSTALL = :
+-POST_UNINSTALL = :
+-host_alias = @host_alias@
+-host_triplet = @host@
+-AS = @AS@
+-CATALOGS = @CATALOGS@
+-CATOBJEXT = @CATOBJEXT@
+-CC = @CC@
+-CFLAGS = @CFLAGS@
+-DATADIRNAME = @DATADIRNAME@
+-DLLTOOL = @DLLTOOL@
+-DL_LIB = @DL_LIB@
+-ESD_CFLAGS = @ESD_CFLAGS@
+-ESD_CONFIG = @ESD_CONFIG@
+-ESD_LIBS = @ESD_LIBS@
+-GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@
+-GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@
+-GENCAT = @GENCAT@
+-GMOFILES = @GMOFILES@
+-GMSGFMT = @GMSGFMT@
+-GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@
+-GNOMEUI_LIBS = @GNOMEUI_LIBS@
+-GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@
+-GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@
+-GNOME_CONFIG = @GNOME_CONFIG@
+-GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@
+-GNOME_LIBDIR = @GNOME_LIBDIR@
+-GNOME_LIBS = @GNOME_LIBS@
+-GNORBA_CFLAGS = @GNORBA_CFLAGS@
+-GNORBA_LIBS = @GNORBA_LIBS@
+-GTKXMHTML_LIBS = @GTKXMHTML_LIBS@
+-GTK_CFLAGS = @GTK_CFLAGS@
+-GTK_CONFIG = @GTK_CONFIG@
+-GTK_LIBS = @GTK_LIBS@
+-GT_NO = @GT_NO@
+-GT_YES = @GT_YES@
+-IMLIB_CFLAGS = @IMLIB_CFLAGS@
+-IMLIB_CONFIG = @IMLIB_CONFIG@
+-IMLIB_LIBS = @IMLIB_LIBS@
+-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+-INSTOBJEXT = @INSTOBJEXT@
+-INTLDEPS = @INTLDEPS@
+-INTLLIBS = @INTLLIBS@
+-INTLOBJS = @INTLOBJS@
+-LDFLAGS = @LDFLAGS@
+-LEX = @LEX@
+-LIBTOOL = @LIBTOOL@
+-LN_S = @LN_S@
+-MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-OBJDUMP = @OBJDUMP@
+-ORBIT_CFLAGS = @ORBIT_CFLAGS@
+-ORBIT_CONFIG = @ORBIT_CONFIG@
+-ORBIT_IDL = @ORBIT_IDL@
+-ORBIT_LIBS = @ORBIT_LIBS@
+-ORB_CFLAGS = @ORB_CFLAGS@
+-ORB_LIBS = @ORB_LIBS@
+-PACKAGE = @PACKAGE@
+-PIXBUF_CFLAGS = @PIXBUF_CFLAGS@
+-PIXBUF_LIBS = @PIXBUF_LIBS@
+-POFILES = @POFILES@
+-POSUB = @POSUB@
+-PTHREAD_LIB = @PTHREAD_LIB@
+-RANLIB = @RANLIB@
+-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+-USE_NLS = @USE_NLS@
+-VERSION = @VERSION@
+-VFS_CFLAGS = @VFS_CFLAGS@
+-VFS_LIBS = @VFS_LIBS@
+-XF86MISC_LIBS = @XF86MISC_LIBS@
+-XML_I18N_EXTRACT = @XML_I18N_EXTRACT@
+-XML_I18N_MERGE = @XML_I18N_MERGE@
+-XML_I18N_TOOLS_PERL = @XML_I18N_TOOLS_PERL@
+-XML_I18N_UPDATE = @XML_I18N_UPDATE@
+-XPM_LIBS = @XPM_LIBS@
+-YACC = @YACC@
+-ZVT_LIBS = @ZVT_LIBS@
+-cflags_set = @cflags_set@
+-cxxflags_set = @cxxflags_set@
+-l = @l@
+-
+-NULL = 
+-
+-SUBDIRS = libuuid
+-
+-INCLUDES = -I.                                                        -I$(top_srcdir)                                         -I$(srcdir)                                             -I$(top_srcdir)/intl -I$(top_builddir)/intl             -I$(top_srcdir)/libgnomevfs                             -I$(srcdir)/../../control-center                        $(GNOME_INCLUDEDIR)                                     $(GTK_CFLAGS)                                           -DGNOMELOCALEDIR=\""$(datadir)/locale"\"                -I$(includedir)                                         $(VFS_CFLAGS) $(WERROR)                                 $(NULL)
+-
+-
+-bin_PROGRAMS = file-types-capplet
+-
+-file_types_capplet_SOURCES =          file-types-capplet.h                    file-types-capplet-dialogs.h            file-types-icon-entry.h                 file-types-capplet.c                    file-types-capplet-dialogs.c            file-types-icon-entry.c                 $(NULL)
+-
+-
+-file_types_capplet_LDADD =    ../../control-center/libcapplet.la              $(ORBIT_LIBS)                                   $(INTLLIBS)                                     $(VFS_LIBS)                                     -lgdk_pixbuf                                    $/libuuid/libuuid.a                             $(NULL)
+-
+-
+-sysdir = $(datadir)/control-center/Documents
+-sys_in_files = file-types-capplet.desktop.in 
+-sys_DATA = $(sys_in_files:.desktop.in=.desktop)
+-
+-settingsdir = $(datadir)/gnome/apps/Settings
+-settings_DATA = $(sys_DATA)
+-
+-EXTRA_DIST =          $(sys_DATA) $(sys_in_files)
+-
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = ../../config.h
+-CONFIG_CLEAN_FILES = 
+-PROGRAMS =  $(bin_PROGRAMS)
+-
+-
+-DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+-CPPFLAGS = @CPPFLAGS@
+-LIBS = @LIBS@
+-file_types_capplet_OBJECTS =  file-types-capplet.o \
+-file-types-capplet-dialogs.o file-types-icon-entry.o
+-file_types_capplet_DEPENDENCIES =  ../../control-center/libcapplet.la \
+-$/libuuid/libuuid.a
+-file_types_capplet_LDFLAGS = 
+-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+-DATA =  $(settings_DATA) $(sys_DATA)
+-
+-DIST_COMMON =  Makefile.am Makefile.in
+-
+-
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+-
+-TAR = tar
+-GZIP_ENV = --best
+-SOURCES = $(file_types_capplet_SOURCES)
+-OBJECTS = $(file_types_capplet_OBJECTS)
+-
+-all: all-redirect
+-.SUFFIXES:
+-.SUFFIXES: .S .c .lo .o .s
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-      cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps capplets/file-types/Makefile
+-
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-      cd $(top_builddir) \
+-        && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+-
+-
+-mostlyclean-binPROGRAMS:
+-
+-clean-binPROGRAMS:
+-      -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+-
+-distclean-binPROGRAMS:
+-
+-maintainer-clean-binPROGRAMS:
+-
+-install-binPROGRAMS: $(bin_PROGRAMS)
+-      @$(NORMAL_INSTALL)
+-      $(mkinstalldirs) $(DESTDIR)$(bindir)
+-      @list='$(bin_PROGRAMS)'; for p in $$list; do \
+-        if test -f $$p; then \
+-          echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+-          $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+-        else :; fi; \
+-      done
+-
+-uninstall-binPROGRAMS:
+-      @$(NORMAL_UNINSTALL)
+-      list='$(bin_PROGRAMS)'; for p in $$list; do \
+-        rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+-      done
+-
+-.c.o:
+-      $(COMPILE) -c $<
+-
+-.s.o:
+-      $(COMPILE) -c $<
+-
+-.S.o:
+-      $(COMPILE) -c $<
+-
+-mostlyclean-compile:
+-      -rm -f *.o core *.core
+-
+-clean-compile:
+-
+-distclean-compile:
+-      -rm -f *.tab.c
+-
+-maintainer-clean-compile:
+-
+-.c.lo:
+-      $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+-.s.lo:
+-      $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+-.S.lo:
+-      $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+-mostlyclean-libtool:
+-      -rm -f *.lo
+-
+-clean-libtool:
+-      -rm -rf .libs _libs
+-
+-distclean-libtool:
+-
+-maintainer-clean-libtool:
+-
+-file-types-capplet: $(file_types_capplet_OBJECTS) $(file_types_capplet_DEPENDENCIES)
+-      @rm -f file-types-capplet
+-      $(LINK) $(file_types_capplet_LDFLAGS) $(file_types_capplet_OBJECTS) $(file_types_capplet_LDADD) $(LIBS)
+-
+-install-settingsDATA: $(settings_DATA)
+-      @$(NORMAL_INSTALL)
+-      $(mkinstalldirs) $(DESTDIR)$(settingsdir)
+-      @list='$(settings_DATA)'; for p in $$list; do \
+-        if test -f $(srcdir)/$$p; then \
+-          echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(settingsdir)/$$p"; \
+-          $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(settingsdir)/$$p; \
+-        else if test -f $$p; then \
+-          echo " $(INSTALL_DATA) $$p $(DESTDIR)$(settingsdir)/$$p"; \
+-          $(INSTALL_DATA) $$p $(DESTDIR)$(settingsdir)/$$p; \
+-        fi; fi; \
+-      done
+-
+-uninstall-settingsDATA:
+-      @$(NORMAL_UNINSTALL)
+-      list='$(settings_DATA)'; for p in $$list; do \
+-        rm -f $(DESTDIR)$(settingsdir)/$$p; \
+-      done
+-
+-install-sysDATA: $(sys_DATA)
+-      @$(NORMAL_INSTALL)
+-      $(mkinstalldirs) $(DESTDIR)$(sysdir)
+-      @list='$(sys_DATA)'; for p in $$list; do \
+-        if test -f $(srcdir)/$$p; then \
+-          echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysdir)/$$p"; \
+-          $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysdir)/$$p; \
+-        else if test -f $$p; then \
+-          echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysdir)/$$p"; \
+-          $(INSTALL_DATA) $$p $(DESTDIR)$(sysdir)/$$p; \
+-        fi; fi; \
+-      done
+-
+-uninstall-sysDATA:
+-      @$(NORMAL_UNINSTALL)
+-      list='$(sys_DATA)'; for p in $$list; do \
+-        rm -f $(DESTDIR)$(sysdir)/$$p; \
+-      done
+-
+-# This directory's subdirectories are mostly independent; you can cd
+-# into them and run `make' without going through this Makefile.
+-# To change the values of `make' variables: instead of editing Makefiles,
+-# (1) if the variable is set in `config.status', edit `config.status'
+-#     (which will cause the Makefiles to be regenerated when you run `make');
+-# (2) otherwise, pass the desired values on the `make' command line.
+-
+-@SET_MAKE@
+-
+-all-recursive install-data-recursive install-exec-recursive \
+-installdirs-recursive install-recursive uninstall-recursive  \
+-check-recursive installcheck-recursive info-recursive dvi-recursive:
+-      @set fnord $(MAKEFLAGS); amf=$$2; \
+-      dot_seen=no; \
+-      target=`echo $@ | sed s/-recursive//`; \
+-      list='$(SUBDIRS)'; for subdir in $$list; do \
+-        echo "Making $$target in $$subdir"; \
+-        if test "$$subdir" = "."; then \
+-          dot_seen=yes; \
+-          local_target="$$target-am"; \
+-        else \
+-          local_target="$$target"; \
+-        fi; \
+-        (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-         || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+-      done; \
+-      if test "$$dot_seen" = "no"; then \
+-        $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+-      fi; test -z "$$fail"
+-
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
+-      @set fnord $(MAKEFLAGS); amf=$$2; \
+-      dot_seen=no; \
+-      rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-        rev="$$subdir $$rev"; \
+-        test "$$subdir" = "." && dot_seen=yes; \
+-      done; \
+-      test "$$dot_seen" = "no" && rev=". $$rev"; \
+-      target=`echo $@ | sed s/-recursive//`; \
+-      for subdir in $$rev; do \
+-        echo "Making $$target in $$subdir"; \
+-        if test "$$subdir" = "."; then \
+-          local_target="$$target-am"; \
+-        else \
+-          local_target="$$target"; \
+-        fi; \
+-        (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-         || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+-      done && test -z "$$fail"
+-tags-recursive:
+-      list='$(SUBDIRS)'; for subdir in $$list; do \
+-        test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+-      done
+-
+-tags: TAGS
+-
+-ID: $(HEADERS) $(SOURCES) $(LISP)
+-      list='$(SOURCES) $(HEADERS)'; \
+-      unique=`for i in $$list; do echo $$i; done | \
+-        awk '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
+-      here=`pwd` && cd $(srcdir) \
+-        && mkid -f$$here/ID $$unique $(LISP)
+-
+-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+-      tags=; \
+-      here=`pwd`; \
+-      list='$(SUBDIRS)'; for subdir in $$list; do \
+-   if test "$$subdir" = .; then :; else \
+-          test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+-   fi; \
+-      done; \
+-      list='$(SOURCES) $(HEADERS)'; \
+-      unique=`for i in $$list; do echo $$i; done | \
+-        awk '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
+-      test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+-        || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+-
+-mostlyclean-tags:
+-
+-clean-tags:
+-
+-distclean-tags:
+-      -rm -f TAGS ID
+-
+-maintainer-clean-tags:
+-
+-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+-
+-subdir = capplets/file-types
+-
+-distdir: $(DISTFILES)
+-      @for file in $(DISTFILES); do \
+-        d=$(srcdir); \
+-        if test -d $$d/$$file; then \
+-          cp -pr $$d/$$file $(distdir)/$$file; \
+-        else \
+-          test -f $(distdir)/$$file \
+-          || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-          || cp -p $$d/$$file $(distdir)/$$file || :; \
+-        fi; \
+-      done
+-      for subdir in $(SUBDIRS); do \
+-        if test "$$subdir" = .; then :; else \
+-          test -d $(distdir)/$$subdir \
+-          || mkdir $(distdir)/$$subdir \
+-          || exit 1; \
+-          chmod 777 $(distdir)/$$subdir; \
+-          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+-            || exit 1; \
+-        fi; \
+-      done
+-file-types-capplet-dialogs.o: file-types-capplet-dialogs.c \
+-      ../../config.h ../../control-center/capplet-widget.h \
+-      libuuid/uuid.h file-types-capplet.h \
+-      file-types-capplet-dialogs.h
+-file-types-capplet.o: file-types-capplet.c ../../config.h \
+-      ../../control-center/capplet-widget.h \
+-      file-types-capplet-dialogs.h file-types-icon-entry.h \
+-      file-types-capplet.h
+-file-types-icon-entry.o: file-types-icon-entry.c ../../config.h \
+-      file-types-icon-entry.h file-types-capplet.h
+-
+-info-am:
+-info: info-recursive
+-dvi-am:
+-dvi: dvi-recursive
+-check-am: all-am
+-check: check-recursive
+-installcheck-am:
+-installcheck: installcheck-recursive
+-install-exec-am: install-binPROGRAMS
+-install-exec: install-exec-recursive
+-
+-install-data-am: install-settingsDATA install-sysDATA
+-install-data: install-data-recursive
+-
+-install-am: all-am
+-      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-install: install-recursive
+-uninstall-am: uninstall-binPROGRAMS uninstall-settingsDATA \
+-              uninstall-sysDATA
+-uninstall: uninstall-recursive
+-all-am: Makefile $(PROGRAMS) $(DATA)
+-all-redirect: all-recursive
+-install-strip:
+-      $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+-installdirs: installdirs-recursive
+-installdirs-am:
+-      $(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(settingsdir) \
+-              $(DESTDIR)$(sysdir)
+-
+-
+-mostlyclean-generic:
+-
+-clean-generic:
+-
+-distclean-generic:
+-      -rm -f Makefile $(CONFIG_CLEAN_FILES)
+-      -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+-
+-maintainer-clean-generic:
+-mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
+-              mostlyclean-libtool mostlyclean-tags \
+-              mostlyclean-generic
+-
+-mostlyclean: mostlyclean-recursive
+-
+-clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
+-              clean-generic mostlyclean-am
+-
+-clean: clean-recursive
+-
+-distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
+-              distclean-tags distclean-generic clean-am
+-      -rm -f libtool
+-
+-distclean: distclean-recursive
+-
+-maintainer-clean-am:  maintainer-clean-binPROGRAMS \
+-              maintainer-clean-compile maintainer-clean-libtool \
+-              maintainer-clean-tags maintainer-clean-generic \
+-              distclean-am
+-      @echo "This command is intended for maintainers to use;"
+-      @echo "it deletes files that may require special tools to rebuild."
+-
+-maintainer-clean: maintainer-clean-recursive
+-
+-.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
+-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
+-mostlyclean-compile distclean-compile clean-compile \
+-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+-clean-libtool maintainer-clean-libtool uninstall-settingsDATA \
+-install-settingsDATA uninstall-sysDATA install-sysDATA \
+-install-data-recursive uninstall-data-recursive install-exec-recursive \
+-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+-all-recursive check-recursive installcheck-recursive info-recursive \
+-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+-install-exec install-data-am install-data install-am install \
+-uninstall-am uninstall all-redirect all-am all installdirs-am \
+-installdirs mostlyclean-generic distclean-generic clean-generic \
+-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+-
+-
+-@XML_I18N_MERGE_DESKTOP_RULE@
+-
+-# 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 -urN control-center-1.4.0.1.org/capplets/gnome-edit-properties/Makefile.am control-center-1.4.0.1/capplets/gnome-edit-properties/Makefile.am
+--- control-center-1.4.0.1.org/capplets/gnome-edit-properties/Makefile.am      Sun Apr  1 18:49:14 2001
++++ control-center-1.4.0.1/capplets/gnome-edit-properties/Makefile.am  Sun Apr  1 18:52:37 2001
+@@ -24,4 +24,4 @@
+ @XML_I18N_MERGE_DESKTOP_RULE@
  
  install-data-local:
 -      $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/gnome-edit-properties.desktop
 +      $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/gnome-edit-properties.desktop
-diff -Nru control-center-1.2.3/capplets/keyboard-properties/Makefile.am control-center-1.2.3.new/capplets/keyboard-properties/Makefile.am
---- control-center-1.2.3/capplets/keyboard-properties/Makefile.am      Tue Feb 20 02:32:44 2001
-+++ control-center-1.2.3.new/capplets/keyboard-properties/Makefile.am  Tue Feb 20 02:34:28 2001
-@@ -19,4 +19,4 @@
- sys_DATA = keyboard-properties.desktop
+diff -urN control-center-1.4.0.1.org/capplets/keyboard-properties/Makefile.am control-center-1.4.0.1/capplets/keyboard-properties/Makefile.am
+--- control-center-1.4.0.1.org/capplets/keyboard-properties/Makefile.am        Sun Apr  1 18:49:14 2001
++++ control-center-1.4.0.1/capplets/keyboard-properties/Makefile.am    Sun Apr  1 18:52:37 2001
+@@ -22,4 +22,4 @@
+ @XML_I18N_MERGE_DESKTOP_RULE@
  
  install-data-local:
 -      $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
 +      $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/keyboard-properties.desktop
-diff -Nru control-center-1.2.3/capplets/mime-type/Makefile.am control-center-1.2.3.new/capplets/mime-type/Makefile.am
---- control-center-1.2.3/capplets/mime-type/Makefile.am        Tue Feb 20 02:32:44 2001
-+++ control-center-1.2.3.new/capplets/mime-type/Makefile.am    Tue Feb 20 02:34:42 2001
+diff -urN control-center-1.4.0.1.org/capplets/mouse-properties/Makefile.am control-center-1.4.0.1/capplets/mouse-properties/Makefile.am
+--- control-center-1.4.0.1.org/capplets/mouse-properties/Makefile.am   Sun Apr  1 18:49:14 2001
++++ control-center-1.4.0.1/capplets/mouse-properties/Makefile.am       Sun Apr  1 18:52:39 2001
 @@ -23,4 +23,4 @@
- sys_DATA = mime-type.desktop 
- 
- install-data-local:
--      $(INSTALL_DATA) $(srcdir)/mime-type.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/mime-type.desktop
-+      $(INSTALL_DATA) $(srcdir)/mime-type.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/mime-type.desktop
-diff -Nru control-center-1.2.3/capplets/mouse-properties/Makefile.am control-center-1.2.3.new/capplets/mouse-properties/Makefile.am
---- control-center-1.2.3/capplets/mouse-properties/Makefile.am Tue Feb 20 02:32:44 2001
-+++ control-center-1.2.3.new/capplets/mouse-properties/Makefile.am     Tue Feb 20 02:34:57 2001
-@@ -20,4 +20,4 @@
- sys_DATA = mouse-properties.desktop 
+ @XML_I18N_MERGE_DESKTOP_RULE@
  
  install-data-local:
 -      $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/mouse-properties.desktop
 +      $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/mouse-properties.desktop
-diff -Nru control-center-1.2.3/capplets/screensaver-properties/Makefile.am control-center-1.2.3.new/capplets/screensaver-properties/Makefile.am
---- control-center-1.2.3/capplets/screensaver-properties/Makefile.am   Tue Feb 20 02:32:44 2001
-+++ control-center-1.2.3.new/capplets/screensaver-properties/Makefile.am       Tue Feb 20 02:35:13 2001
-@@ -29,4 +29,4 @@
- sys_DATA = screensaver-properties.desktop
+diff -urN control-center-1.4.0.1.org/capplets/screensaver-properties/Makefile.am control-center-1.4.0.1/capplets/screensaver-properties/Makefile.am
+--- control-center-1.4.0.1.org/capplets/screensaver-properties/Makefile.am     Sun Apr  1 18:49:13 2001
++++ control-center-1.4.0.1/capplets/screensaver-properties/Makefile.am Sun Apr  1 18:52:39 2001
+@@ -31,4 +31,4 @@
+ @XML_I18N_MERGE_DESKTOP_RULE@
  
  install-data-local:
 -      $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 +      $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/screensaver-properties.desktop
-diff -Nru control-center-1.2.3/capplets/sound-properties/Makefile.am control-center-1.2.3.new/capplets/sound-properties/Makefile.am
---- control-center-1.2.3/capplets/sound-properties/Makefile.am Tue Feb 20 02:32:44 2001
-+++ control-center-1.2.3.new/capplets/sound-properties/Makefile.am     Tue Feb 20 02:35:41 2001
-@@ -21,4 +21,4 @@
- sys_DATA = sound-properties.desktop
+diff -urN control-center-1.4.0.1.org/capplets/sound-properties/Makefile.am control-center-1.4.0.1/capplets/sound-properties/Makefile.am
+--- control-center-1.4.0.1.org/capplets/sound-properties/Makefile.am   Sun Apr  1 18:49:14 2001
++++ control-center-1.4.0.1/capplets/sound-properties/Makefile.am       Sun Apr  1 18:52:39 2001
+@@ -24,4 +24,4 @@
+ @XML_I18N_MERGE_DESKTOP_RULE@
  
  install-data-local:
 -      $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Multimedia/sound-properties.desktop
 +      $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Multimedia/sound-properties.desktop
-diff -Nru control-center-1.2.3/capplets/theme-switcher/Makefile.am control-center-1.2.3.new/capplets/theme-switcher/Makefile.am
---- control-center-1.2.3/capplets/theme-switcher/Makefile.am   Tue Feb 20 02:32:44 2001
-+++ control-center-1.2.3.new/capplets/theme-switcher/Makefile.am       Tue Feb 20 02:35:55 2001
-@@ -31,4 +31,4 @@
- sys_DATA = theme-selector.desktop
+diff -urN control-center-1.4.0.1.org/capplets/theme-switcher/Makefile.am control-center-1.4.0.1/capplets/theme-switcher/Makefile.am
+--- control-center-1.4.0.1.org/capplets/theme-switcher/Makefile.am     Sun Apr  1 18:49:14 2001
++++ control-center-1.4.0.1/capplets/theme-switcher/Makefile.am Sun Apr  1 18:52:39 2001
+@@ -34,4 +34,4 @@
+ @XML_I18N_MERGE_DESKTOP_RULE@
  
  install-data-local:
 -      $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/theme-selector.desktop
 +      $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/theme-selector.desktop
-diff -Nru control-center-1.2.3/capplets/ui-properties/Makefile.am control-center-1.2.3.new/capplets/ui-properties/Makefile.am
---- control-center-1.2.3/capplets/ui-properties/Makefile.am    Tue Feb 20 02:32:44 2001
-+++ control-center-1.2.3.new/capplets/ui-properties/Makefile.am        Tue Feb 20 02:36:16 2001
-@@ -27,6 +27,6 @@
-       mdi.desktop 
- 
- install-data-local:
--      $(INSTALL_DATA) $(srcdir)/application.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/application.desktop
--      $(INSTALL_DATA) $(srcdir)/dialogs.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/dialogs.desktop
--      $(INSTALL_DATA) $(srcdir)/mdi.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/mdi.desktop
-+      $(INSTALL_DATA) $(srcdir)/application.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/application.desktop
-+      $(INSTALL_DATA) $(srcdir)/dialogs.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/dialogs.desktop
-+      $(INSTALL_DATA) $(srcdir)/mdi.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/mdi.desktop
-diff -Nru control-center-1.2.3/capplets/url-properties/Makefile.am control-center-1.2.3.new/capplets/url-properties/Makefile.am
---- control-center-1.2.3/capplets/url-properties/Makefile.am   Tue Feb 20 02:32:44 2001
-+++ control-center-1.2.3.new/capplets/url-properties/Makefile.am       Tue Feb 20 02:36:28 2001
-@@ -21,4 +21,4 @@
- sys_DATA = url-properties.desktop
+diff -urN control-center-1.4.0.1.org/capplets/url-properties/Makefile.am control-center-1.4.0.1/capplets/url-properties/Makefile.am
+--- control-center-1.4.0.1.org/capplets/url-properties/Makefile.am     Sun Apr  1 18:49:14 2001
++++ control-center-1.4.0.1/capplets/url-properties/Makefile.am Sun Apr  1 18:52:39 2001
+@@ -24,4 +24,4 @@
+ @XML_I18N_MERGE_DESKTOP_RULE@
  
  install-data-local:
 -      $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/url-properties.desktop
 +      $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/url-properties.desktop
-diff -Nru control-center-1.2.3/capplets/wm-properties/Makefile.am control-center-1.2.3.new/capplets/wm-properties/Makefile.am
---- control-center-1.2.3/capplets/wm-properties/Makefile.am    Tue Feb 20 02:32:44 2001
-+++ control-center-1.2.3.new/capplets/wm-properties/Makefile.am        Tue Feb 20 02:36:46 2001
-@@ -25,5 +25,5 @@
- sysdir = $(datadir)/control-center/Desktop
- sys_DATA = wm-properties.desktop
+diff -urN control-center-1.4.0.1.org/capplets/wm-properties/Makefile.am control-center-1.4.0.1/capplets/wm-properties/Makefile.am
+--- control-center-1.4.0.1.org/capplets/wm-properties/Makefile.am      Sun Apr  1 18:49:14 2001
++++ control-center-1.4.0.1/capplets/wm-properties/Makefile.am  Sun Apr  1 18:55:37 2001
+@@ -26,7 +26,7 @@
+ sys_in_files = wm-properties.desktop.in
+ sys_DATA = $(sys_in_files:.desktop.in=.desktop)
  
 -Setdir = $(datadir)/gnome/apps/Settings/Desktop
-+Setdir = $(datadir)/applnk/Settings/GNOME/Desktop
- Set_DATA = wm-properties.desktop
-diff -Nru control-center-1.2.3/control-center/Makefile.am control-center-1.2.3.new/control-center/Makefile.am
---- control-center-1.2.3/control-center/Makefile.am    Tue Feb 20 02:32:44 2001
-+++ control-center-1.2.3.new/control-center/Makefile.am        Tue Feb 20 02:31:47 2001
++Setdir = $(datadir)/applnk/Settings/Desktop
+ 
+ Set_DATA = $(sys_DATA)
+ 
+diff -urN control-center-1.4.0.1.org/control-center/Makefile.am control-center-1.4.0.1/control-center/Makefile.am
+--- control-center-1.4.0.1.org/control-center/Makefile.am      Sun Apr  1 18:49:15 2001
++++ control-center-1.4.0.1/control-center/Makefile.am  Sun Apr  1 18:56:01 2001
 @@ -47,7 +47,7 @@
  
- EXTRA_DIST = gnomecc.desktop cappletConf.sh.in $(appicon_DATA) $(splash_DATA)
+ EXTRA_DIST = gnomecc.desktop.in cappletConf.sh.in $(appicon_DATA) $(splash_DATA)
  
 -sysdir = $(datadir)/gnome/apps/Settings
 +sysdir = $(datadir)/applnk/Settings
- sys_DATA = gnomecc.desktop
- 
- ## Put `exec' in the name because this should be installed by
+ sys_in_files = gnomecc.desktop.in
+ sys_DATA = $(sys_in_files:.desktop.in=.desktop)
+ @XML_I18N_MERGE_DESKTOP_RULE@
+diff -urN control-center-1.4.0.1.org/control-center-applnk.patch control-center-1.4.0.1/control-center-applnk.patch
+--- control-center-1.4.0.1.org/control-center-applnk.patch     Thu Jan  1 01:00:00 1970
++++ control-center-1.4.0.1/control-center-applnk.patch Sun Apr  1 18:46:58 2001
+@@ -0,0 +1,128 @@
++diff -Nru control-center-1.2.3/capplets/background-properties/Makefile.am control-center-1.2.3.new/capplets/background-properties/Makefile.am
++--- control-center-1.2.3/capplets/background-properties/Makefile.am   Tue Feb 20 02:32:44 2001
+++++ control-center-1.2.3.new/capplets/background-properties/Makefile.am       Tue Feb 20 02:33:18 2001
++@@ -26,4 +26,4 @@
++ sys_DATA = background-properties.desktop 
++ 
++ install-data-local:
++-     $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/background-properties.desktop
+++     $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/background-properties.desktop
++diff -Nru control-center-1.2.3/capplets/desktop-links/Makefile.am control-center-1.2.3.new/capplets/desktop-links/Makefile.am
++--- control-center-1.2.3/capplets/desktop-links/Makefile.am   Tue Feb 20 02:32:44 2001
+++++ control-center-1.2.3.new/capplets/desktop-links/Makefile.am       Tue Feb 20 02:33:37 2001
++@@ -6,7 +6,7 @@
++ Sessiondir   = $(ccenterdir)/Session
++ Documentsdir = $(ccenterdir)/Documents
++ 
++-paneldir        = $(datadir)/gnome/apps/Settings
+++paneldir        = $(datadir)/applnk/Settings/GNOME
++ Multimediadirp       = $(paneldir)/Multimedia
++ Desktopdirp  = $(paneldir)/Desktop
++ UIOptionsdirp   = $(paneldir)/UIOptions
++diff -Nru control-center-1.2.3/capplets/gnome-edit-properties/Makefile.am control-center-1.2.3.new/capplets/gnome-edit-properties/Makefile.am
++--- control-center-1.2.3/capplets/gnome-edit-properties/Makefile.am   Tue Feb 20 02:32:44 2001
+++++ control-center-1.2.3.new/capplets/gnome-edit-properties/Makefile.am       Tue Feb 20 02:33:59 2001
++@@ -21,4 +21,4 @@
++ sys_DATA = gnome-edit-properties.desktop
++ 
++ install-data-local:
++-     $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/gnome-edit-properties.desktop
+++     $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/gnome-edit-properties.desktop
++diff -Nru control-center-1.2.3/capplets/keyboard-properties/Makefile.am control-center-1.2.3.new/capplets/keyboard-properties/Makefile.am
++--- control-center-1.2.3/capplets/keyboard-properties/Makefile.am     Tue Feb 20 02:32:44 2001
+++++ control-center-1.2.3.new/capplets/keyboard-properties/Makefile.am Tue Feb 20 02:34:28 2001
++@@ -19,4 +19,4 @@
++ sys_DATA = keyboard-properties.desktop
++ 
++ install-data-local:
++-     $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
+++     $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/keyboard-properties.desktop
++diff -Nru control-center-1.2.3/capplets/mime-type/Makefile.am control-center-1.2.3.new/capplets/mime-type/Makefile.am
++--- control-center-1.2.3/capplets/mime-type/Makefile.am       Tue Feb 20 02:32:44 2001
+++++ control-center-1.2.3.new/capplets/mime-type/Makefile.am   Tue Feb 20 02:34:42 2001
++@@ -23,4 +23,4 @@
++ sys_DATA = mime-type.desktop 
++ 
++ install-data-local:
++-     $(INSTALL_DATA) $(srcdir)/mime-type.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/mime-type.desktop
+++     $(INSTALL_DATA) $(srcdir)/mime-type.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/mime-type.desktop
++diff -Nru control-center-1.2.3/capplets/mouse-properties/Makefile.am control-center-1.2.3.new/capplets/mouse-properties/Makefile.am
++--- control-center-1.2.3/capplets/mouse-properties/Makefile.am        Tue Feb 20 02:32:44 2001
+++++ control-center-1.2.3.new/capplets/mouse-properties/Makefile.am    Tue Feb 20 02:34:57 2001
++@@ -20,4 +20,4 @@
++ sys_DATA = mouse-properties.desktop 
++ 
++ install-data-local:
++-     $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/mouse-properties.desktop
+++     $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/mouse-properties.desktop
++diff -Nru control-center-1.2.3/capplets/screensaver-properties/Makefile.am control-center-1.2.3.new/capplets/screensaver-properties/Makefile.am
++--- control-center-1.2.3/capplets/screensaver-properties/Makefile.am  Tue Feb 20 02:32:44 2001
+++++ control-center-1.2.3.new/capplets/screensaver-properties/Makefile.am      Tue Feb 20 02:35:13 2001
++@@ -29,4 +29,4 @@
++ sys_DATA = screensaver-properties.desktop
++ 
++ install-data-local:
++-     $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/screensaver-properties.desktop
+++     $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/screensaver-properties.desktop
++diff -Nru control-center-1.2.3/capplets/sound-properties/Makefile.am control-center-1.2.3.new/capplets/sound-properties/Makefile.am
++--- control-center-1.2.3/capplets/sound-properties/Makefile.am        Tue Feb 20 02:32:44 2001
+++++ control-center-1.2.3.new/capplets/sound-properties/Makefile.am    Tue Feb 20 02:35:41 2001
++@@ -21,4 +21,4 @@
++ sys_DATA = sound-properties.desktop
++ 
++ install-data-local:
++-     $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Multimedia/sound-properties.desktop
+++     $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Multimedia/sound-properties.desktop
++diff -Nru control-center-1.2.3/capplets/theme-switcher/Makefile.am control-center-1.2.3.new/capplets/theme-switcher/Makefile.am
++--- control-center-1.2.3/capplets/theme-switcher/Makefile.am  Tue Feb 20 02:32:44 2001
+++++ control-center-1.2.3.new/capplets/theme-switcher/Makefile.am      Tue Feb 20 02:35:55 2001
++@@ -31,4 +31,4 @@
++ sys_DATA = theme-selector.desktop
++ 
++ install-data-local:
++-     $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/theme-selector.desktop
+++     $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/theme-selector.desktop
++diff -Nru control-center-1.2.3/capplets/ui-properties/Makefile.am control-center-1.2.3.new/capplets/ui-properties/Makefile.am
++--- control-center-1.2.3/capplets/ui-properties/Makefile.am   Tue Feb 20 02:32:44 2001
+++++ control-center-1.2.3.new/capplets/ui-properties/Makefile.am       Tue Feb 20 02:36:16 2001
++@@ -27,6 +27,6 @@
++      mdi.desktop 
++ 
++ install-data-local:
++-     $(INSTALL_DATA) $(srcdir)/application.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/application.desktop
++-     $(INSTALL_DATA) $(srcdir)/dialogs.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/dialogs.desktop
++-     $(INSTALL_DATA) $(srcdir)/mdi.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/mdi.desktop
+++     $(INSTALL_DATA) $(srcdir)/application.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/application.desktop
+++     $(INSTALL_DATA) $(srcdir)/dialogs.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/dialogs.desktop
+++     $(INSTALL_DATA) $(srcdir)/mdi.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/mdi.desktop
++diff -Nru control-center-1.2.3/capplets/url-properties/Makefile.am control-center-1.2.3.new/capplets/url-properties/Makefile.am
++--- control-center-1.2.3/capplets/url-properties/Makefile.am  Tue Feb 20 02:32:44 2001
+++++ control-center-1.2.3.new/capplets/url-properties/Makefile.am      Tue Feb 20 02:36:28 2001
++@@ -21,4 +21,4 @@
++ sys_DATA = url-properties.desktop
++ 
++ install-data-local:
++-     $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/url-properties.desktop
+++     $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/url-properties.desktop
++diff -Nru control-center-1.2.3/capplets/wm-properties/Makefile.am control-center-1.2.3.new/capplets/wm-properties/Makefile.am
++--- control-center-1.2.3/capplets/wm-properties/Makefile.am   Tue Feb 20 02:32:44 2001
+++++ control-center-1.2.3.new/capplets/wm-properties/Makefile.am       Tue Feb 20 02:36:46 2001
++@@ -25,5 +25,5 @@
++ sysdir = $(datadir)/control-center/Desktop
++ sys_DATA = wm-properties.desktop
++ 
++-Setdir = $(datadir)/gnome/apps/Settings/Desktop
+++Setdir = $(datadir)/applnk/Settings/GNOME/Desktop
++ Set_DATA = wm-properties.desktop
++diff -Nru control-center-1.2.3/control-center/Makefile.am control-center-1.2.3.new/control-center/Makefile.am
++--- control-center-1.2.3/control-center/Makefile.am   Tue Feb 20 02:32:44 2001
+++++ control-center-1.2.3.new/control-center/Makefile.am       Tue Feb 20 02:31:47 2001
++@@ -47,7 +47,7 @@
++ 
++ EXTRA_DIST = gnomecc.desktop cappletConf.sh.in $(appicon_DATA) $(splash_DATA)
++ 
++-sysdir = $(datadir)/gnome/apps/Settings
+++sysdir = $(datadir)/applnk/Settings
++ sys_DATA = gnomecc.desktop
++ 
++ ## Put `exec' in the name because this should be installed by
diff --git a/control-center-macros.patch b/control-center-macros.patch
new file mode 100644 (file)
index 0000000..0708e29
--- /dev/null
+++ b/control-center-macros.patch
@@ -0,0 +1,129 @@
+diff -urN control-center-1.4.0.1.org/macros/xml-i18n-tools.m4 control-center-1.4.0.1/macros/xml-i18n-tools.m4
+--- control-center-1.4.0.1.org/macros/xml-i18n-tools.m4        Thu Jan  1 01:00:00 1970
++++ control-center-1.4.0.1/macros/xml-i18n-tools.m4    Sun Mar 25 13:28:11 2001
+@@ -0,0 +1,113 @@
++## xml-i18n-tools.m4 - Configure xml-i18n-tools for the target system. -*-Shell-script-*-
++## Copyright (C) 2001 Eazel, Inc.
++## Author: Maciej Stachowiak <mjs@eazel.com>
++##
++## This program is free software; you can redistribute it and/or modify
++## it under the terms of the GNU General Public License as published by
++## the Free Software Foundation; either version 2 of the License, or
++## (at your option) any later version.
++##
++## This program is distributed in the hope that it will be useful, but
++## WITHOUT ANY WARRANTY; without even the implied warranty of
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++## General Public License for more details.
++##
++## You should have received a copy of the GNU General Public License
++## along with this program; if not, write to the Free Software
++## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++##
++## As a special exception to the GNU General Public License, if you
++## distribute this file as part of a program that contains a
++## configuration script generated by Autoconf, you may include it under
++## the same distribution terms that you use for the rest of that program.
++
++# serial 1 AC_PROG_XML_I18N_TOOLS
++AC_DEFUN(AC_PROG_XML_I18N_TOOLS,
++[
++
++dnl This is a hack - we use the expansion of AC_SUBST instead of
++dnl AC_SUBST itself to avoid automake putting 
++dnl XML_I18N_MERGE_OAF_RULE = @XML_I18N_MERGE_OAF_RULE@
++dnl in all the Makefile.in's
++XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
++      $(top_builddir)/xml-i18n-merge -o $(top_srcdir)/po $< [$]*.oaf'
++AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
++s%@XML_I18N_MERGE_OAF_RULE@%[$]XML_I18N_MERGE_OAF_RULE%g
++AC_DIVERT_POP()dnl
++
++dnl same deal
++XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
++      $(top_builddir)/xml-i18n-merge -k $(top_srcdir)/po $< [$]*.keys'
++AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
++s%@XML_I18N_MERGE_KEYS_RULE@%[$]XML_I18N_MERGE_KEYS_RULE%g
++AC_DIVERT_POP()dnl
++
++dnl same deal
++XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
++      $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.desktop'
++AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
++s%@XML_I18N_MERGE_DESKTOP_RULE@%[$]XML_I18N_MERGE_DESKTOP_RULE%g
++AC_DIVERT_POP()dnl
++
++dnl same deal
++XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
++      $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.directory'
++AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
++s%@XML_I18N_MERGE_DIRECTORY_RULE@%[$]XML_I18N_MERGE_DIRECTORY_RULE%g
++AC_DIVERT_POP()dnl
++
++dnl same deal
++XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
++      $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.soundlist'
++AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
++s%@XML_I18N_MERGE_SOUNDLIST_RULE@%[$]XML_I18N_MERGE_SOUNDLIST_RULE%g
++AC_DIVERT_POP()dnl
++
++dnl same deal
++XML_I18N_MERGE_PONG_RULE='\%.pong : \%.pong.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
++      $(top_builddir)/xml-i18n-merge -x $(top_srcdir)/po $< [$]*.pong'
++AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
++s%@XML_I18N_MERGE_PONG_RULE@%[$]XML_I18N_MERGE_PONG_RULE%g
++AC_DIVERT_POP()dnl
++
++# Always use our own xml-i18n-tools.
++XML_I18N_EXTRACT='$(top_builddir)/xml-i18n-extract'
++AC_SUBST(XML_I18N_EXTRACT)dnl
++
++XML_I18N_MERGE='$(top_builddir)/xml-i18n-merge'
++AC_SUBST(XML_I18N_MERGE)dnl
++
++XML_I18N_UPDATE='$(top_builddir)/xml-i18n-update'
++AC_SUBST(XML_I18N_UPDATE)dnl
++
++AC_PATH_PROG(XML_I18N_TOOLS_PERL, perl)
++if test -z "$XML_I18N_TOOLS_PERL"; then
++   AC_MSG_ERROR([perl not found; required for xml-i18n-tools])
++fi
++if test -z "`$XML_I18N_TOOLS_PERL -v | fgrep '5.' 2> /dev/null`"; then
++   AC_MSG_ERROR([perl 5.x required for xml-i18n-tools])
++fi
++
++dnl  manually sed perl in so people don't have to put the xml-i18n-tools scripts in their 
++dnl  AC_OUTPUT
++AC_OUTPUT_COMMANDS([
++sed -e "s:@XML_I18N_TOOLS_PERL@:${XML_I18N_TOOLS_PERL}:;" < ${ac_given_srcdir}/xml-i18n-extract.in > xml-i18n-extract;
++chmod ugo+x xml-i18n-extract;
++chmod u+w xml-i18n-extract;
++
++sed -e "s:@XML_I18N_TOOLS_PERL@:${XML_I18N_TOOLS_PERL}:;" < ${ac_given_srcdir}/xml-i18n-merge.in > xml-i18n-merge;
++chmod ugo+x xml-i18n-merge;
++chmod u+w xml-i18n-merge;
++
++sed -e "s:@XML_I18N_TOOLS_PERL@:${XML_I18N_TOOLS_PERL}:;" < ${ac_given_srcdir}/xml-i18n-update.in > xml-i18n-update;
++chmod ugo+x xml-i18n-update;
++chmod u+w xml-i18n-update;
++], XML_I18N_TOOLS_PERL=${XML_I18N_TOOLS_PERL})
++
++# Redirect the config.log output again, so that the ltconfig log is not
++# clobbered by the next message.
++exec 5>>./config.log
++])
++
++dnl old names
++AC_DEFUN(AM_PROG_XML_I18N_TOOLS, [indir([AC_PROG_XML_I18N_TOOLS])])dnl
+diff -urN control-center-1.4.0.1.org/sgmldocs.make control-center-1.4.0.1/sgmldocs.make
+--- control-center-1.4.0.1.org/sgmldocs.make   Sun Apr  1 18:49:13 2001
++++ control-center-1.4.0.1/sgmldocs.make       Sun Apr  1 19:51:31 2001
+@@ -58,7 +58,7 @@
+       -cp $(docname)/index.html .
+ 
+ $(docname).sgml: $(sgml_ents)
+-        -ourdir=`pwd`;  \
++        ourdir=`pwd`;  \
+         cd $(srcdir);   \
+         cp $(sgml_ents) $$ourdir
+ 
Unnamed repository; edit this file 'description' to name the repository.
This page took 0.291072 seconds and 4 git commands to generate.