diff options
| author | ade <ade@FreeBSD.org> | 2000-06-02 00:10:38 +0800 |
|---|---|---|
| committer | ade <ade@FreeBSD.org> | 2000-06-02 00:10:38 +0800 |
| commit | c80474a686b27c75ee1f2c966739964a2785fe64 (patch) | |
| tree | d578597dbfbb7fffe625b67026a2b9b9df052556 /x11 | |
| parent | 753ae011bb2fbb67800578e67e72ad9f35385219 (diff) | |
| download | freebsd-ports-gnome-c80474a686b27c75ee1f2c966739964a2785fe64.tar.gz freebsd-ports-gnome-c80474a686b27c75ee1f2c966739964a2785fe64.tar.zst freebsd-ports-gnome-c80474a686b27c75ee1f2c966739964a2785fe64.zip | |
Say hello to GNOME 1.2
audio/gnomemedia 1.2.0
deskutils/gnomepim 1.2.0
devel/bugbuddy 1.0
devel/glade 0.5.9
devel/libgtop 1.0.9
games/gnomegames 1.2.0
graphics/imlib 1.9.8.1
misc/gnomeusersguide 1.2
misc/gnomeutils 1.2.0
sysutils/gnomecontrolcenter 1.2.0
sysutils/gtop 1.0.8
x11-fm/gmomemc 4.5.50
x11/gnomecore 1.2.0
x11/gnomelibs 1.2.1
Along with cosmetic changes to other parts of the metaport
for the new shared library version numbers.
Plus. The metaport has been reworked to bring in a few more
often-requested items.
Please note that you absolutely need GTK/GLIB 1.2.8 or higher
for this release.
Diffstat (limited to 'x11')
42 files changed, 1226 insertions, 1306 deletions
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 3d9d92543f29..e337e40e6b93 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomelibs -PORTVERSION= 1.0.62 +PORTVERSION= 1.2.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-libs diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo index ddcba6333ba2..00f11e8fa7a6 100644 --- a/x11/gnome-libs/distinfo +++ b/x11/gnome-libs/distinfo @@ -1 +1 @@ -MD5 (gnome-libs-1.0.62.tar.gz) = 61be1867df2e0a922480901b56ed57e7 +MD5 (gnome-libs-1.2.1.tar.gz) = 1e43e482069c79058ab6842d5294fe15 diff --git a/x11/gnome-libs/files/patch-bb b/x11/gnome-libs/files/patch-bb index 2ec913ffde33..fed78b9bfaa3 100644 --- a/x11/gnome-libs/files/patch-bb +++ b/x11/gnome-libs/files/patch-bb @@ -14,7 +14,7 @@ -libgtkxmhtml_la_LDFLAGS = -version-info 1:1:0 -rpath $(libdir) -+libgtkxmhtml_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgtkxmhtml_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgtkxmhtml_la_LIBADD = $(LIBGTKXMHTML_LIBS) noinst_PROGRAMS = htmltest diff --git a/x11/gnome-libs/files/patch-bc b/x11/gnome-libs/files/patch-bc index c4a44087e4ba..648706058bfe 100644 --- a/x11/gnome-libs/files/patch-bc +++ b/x11/gnome-libs/files/patch-bc @@ -5,7 +5,7 @@ EXTRA_DIST = parse-path.cP -libgnome_la_LDFLAGS = -version-info 35:11:3 #-rpath $(libdir) -+libgnome_la_LDFLAGS = -version-info 3:0:0 #-rpath $(libdir) ++libgnome_la_LDFLAGS = -version-info 4:0:0 #-rpath $(libdir) libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb diff --git a/x11/gnome-libs/files/patch-bd b/x11/gnome-libs/files/patch-bd index 3daa6e3eb9b2..abd17faef5c8 100644 --- a/x11/gnome-libs/files/patch-bd +++ b/x11/gnome-libs/files/patch-bd @@ -5,7 +5,7 @@ -libgnomeui_la_LDFLAGS = -version-info 43:2:11 -rpath $(libdir) -+libgnomeui_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnomeui_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) gnome_segv_LDADD = libgnomeui.la $(top_builddir)/libgnome/libgnome.la $(top_builddir)/libart_lgpl/libart_lgpl.la @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) $(INTLLIBS) diff --git a/x11/gnome-libs/files/patch-be b/x11/gnome-libs/files/patch-be index 324e5016abc8..aa269911e7db 100644 --- a/x11/gnome-libs/files/patch-be +++ b/x11/gnome-libs/files/patch-be @@ -5,7 +5,7 @@ -libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir) -+libgnorba_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnorba_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm loadshlib_SOURCES = loadshlib.c @@ -14,7 +14,7 @@ gnome-unknown-skels.lo gnome-unknown-stubs.lo gnome-unknown-common.lo \ goad.lo orbitgtk.lo orbitgnome.lo orbitns.lo -libgnorbagtk_la_LDFLAGS = -+libgnorbagtk_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnorbagtk_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnorbagtk_la_LIBADD = libgnorbagtk_la_OBJECTS = gnome-factory-skels.lo gnome-factory-stubs.lo \ gnome-factory-common.lo Table-skels.lo Table-stubs.lo Table-common.lo \ diff --git a/x11/gnome-libs/files/patch-bf b/x11/gnome-libs/files/patch-bf index 7bc59afd55d1..44e1d7a697e1 100644 --- a/x11/gnome-libs/files/patch-bf +++ b/x11/gnome-libs/files/patch-bf @@ -14,7 +14,7 @@ libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c libgnomesupport_la_LIBADD = @LTLIBOBJS@ -libgnomesupport_la_LDFLAGS = -version-info 0:0:0 -+libgnomesupport_la_LDFLAGS = -version-info 3:0:0 ++libgnomesupport_la_LDFLAGS = -version-info 4:0:0 BUILT_SOURCES = gnomesupport.h diff --git a/x11/gnome-libs/files/patch-bg b/x11/gnome-libs/files/patch-bg index be3ca87408dd..5405ccdf4607 100644 --- a/x11/gnome-libs/files/patch-bg +++ b/x11/gnome-libs/files/patch-bg @@ -14,7 +14,7 @@ -libzvt_la_LDFLAGS = -version-info 4:7:2 -rpath $(libdir) -+libzvt_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libzvt_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libzvtinclude_HEADERS = lists.h vt.h vtx.h zvtterm.h diff --git a/x11/gnome-libs/files/patch-bi b/x11/gnome-libs/files/patch-bi index 8aeb458ccc39..32e3836e806c 100644 --- a/x11/gnome-libs/files/patch-bi +++ b/x11/gnome-libs/files/patch-bi @@ -5,7 +5,7 @@ -libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@ -+libart_lgpl_la_LDFLAGS = -version-info 3:0:0 ++libart_lgpl_la_LDFLAGS = -version-info 4:0:0 libart_lgplincdir = $(includedir)/libart_lgpl libart_lgplinc_HEADERS = art_affine.h art_alphagamma.h art_bpath.h art_filterlevel.h art_gray_svp.h art_misc.h art_pathcode.h art_pixbuf.h art_point.h art_rect.h art_rect_svp.h art_rect_uta.h art_rgb.h art_rgb_affine.h art_rgb_bitmap_affine.h art_rgb_pixbuf_affine.h art_rgb_rgba_affine.h art_rgb_svp.h art_svp.h art_svp_ops.h art_svp_render_aa.h art_svp_vpath.h art_svp_vpath_stroke.h art_uta.h art_uta_ops.h art_uta_rect.h art_uta_vpath.h art_uta_svp.h art_vpath.h art_vpath_bpath.h art_vpath_svp.h diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist index 3e7d6f9bed51..87db9483d27b 100644 --- a/x11/gnome-libs/pkg-plist +++ b/x11/gnome-libs/pkg-plist @@ -63,6 +63,8 @@ include/libart_lgpl/art_vpath.h include/libart_lgpl/art_vpath_bpath.h include/libart_lgpl/art_vpath_dash.h include/libart_lgpl/art_vpath_svp.h +include/libart_lgpl/libart-features.h +include/libart_lgpl/libart.h include/libgnome/gnome-config.h include/libgnome/gnome-defs.h include/libgnome/gnome-dentry.h @@ -175,28 +177,28 @@ include/zvt/vtx.h include/zvt/zvtterm.h lib/libart_lgpl.a lib/libart_lgpl.so -lib/libart_lgpl.so.3 +lib/libart_lgpl.so.4 lib/libgnome.a lib/libgnome.so -lib/libgnome.so.3 +lib/libgnome.so.4 lib/libgnomesupport.a lib/libgnomesupport.so -lib/libgnomesupport.so.3 +lib/libgnomesupport.so.4 lib/libgnomeui.a lib/libgnomeui.so -lib/libgnomeui.so.3 +lib/libgnomeui.so.4 lib/libgnorba.a lib/libgnorba.so -lib/libgnorba.so.3 +lib/libgnorba.so.4 lib/libgnorbagtk.a lib/libgnorbagtk.so -lib/libgnorbagtk.so.3 +lib/libgnorbagtk.so.4 lib/libgtkxmhtml.a lib/libgtkxmhtml.so -lib/libgtkxmhtml.so.3 +lib/libgtkxmhtml.so.4 lib/libzvt.a lib/libzvt.so -lib/libzvt.so.3 +lib/libzvt.so.4 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/aclocal/libart.m4 diff --git a/x11/gnome/Makefile b/x11/gnome/Makefile index 4df4095d1beb..ece23afd25dd 100644 --- a/x11/gnome/Makefile +++ b/x11/gnome/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome -PORTVERSION= 1.0.53 +PORTVERSION= 1.2 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -16,31 +16,34 @@ MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - ORBit.2:${PORTSDIR}/devel/ORBit \ - Imlib.5:${PORTSDIR}/graphics/imlib \ audiofile.0:${PORTSDIR}/audio/libaudiofile \ esd.2:${PORTSDIR}/audio/esound \ - gnome.3:${PORTSDIR}/x11/gnomelibs \ + Imlib.5:${PORTSDIR}/graphics/imlib \ + ORBit.2:${PORTSDIR}/devel/ORBit \ + gnome.4:${PORTSDIR}/x11/gnomelibs \ gtop.1:${PORTSDIR}/devel/libgtop \ xml.5:${PORTSDIR}/textproc/libxml \ - gnomeprint.9:${PORTSDIR}/print/gnomeprint \ ghttp.1:${PORTSDIR}/www/libghttp \ - obgnome.1:${PORTSDIR}/lang/gnomeobjc \ - glade.3:${PORTSDIR}/devel/libglade -RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio \ - panel:${PORTSDIR}/x11/gnomecore \ - gtcd:${PORTSDIR}/audio/gnomemedia \ + glade.3:${PORTSDIR}/devel/libglade \ + gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ + gnomeprint.9:${PORTSDIR}/print/gnomeprint + +RUN_DEPENDS= ${X11BASE}/share/themes/Metal/ICON.png:${PORTSDIR}/x11-toolkits/gtk-engines \ + another_clock_applet:${PORTSDIR}/x11/gnomeapplets \ + gmc:${PORTSDIR}/x11-fm/gnomemc \ + bug-buddy:${PORTSDIR}/devel/bugbuddy \ + glade:${PORTSDIR}/devel/glade \ + ${LOCALBASE}/lib/python1.5/site-packages/_appletmodule.so:${PORTSDIR}/x11-toolkits/py-gnome \ + ${X11BASE}/share/gnome/help/users-guide/aboutug.html:${PORTSDIR}/misc/gnomeusersguide \ + gcalc:${PORTSDIR}/misc/gnomeutils \ gnomecard:${PORTSDIR}/deskutils/gnomepim \ + ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio \ + gtcd:${PORTSDIR}/audio/gnomemedia \ gnomine:${PORTSDIR}/games/gnomegames \ ElectricEyes:${PORTSDIR}/graphics/electriceyes \ - gcalc:${PORTSDIR}/misc/gnomeutils \ - gtalk:${PORTSDIR}/net/gnomenetwork \ - ggv:${PORTSDIR}/print/ggv \ - gulp:${PORTSDIR}/sysutils/gnomeadmin \ - gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter \ + gnumeric:${PORTSDIR}/math/gnumeric \ gtop:${PORTSDIR}/sysutils/gtop \ - gmc:${PORTSDIR}/x11-fm/gnomemc \ - gnumeric:${PORTSDIR}/math/gnumeric + ggv:${PORTSDIR}/print/ggv NO_BUILD= yes diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index 4df4095d1beb..ece23afd25dd 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome -PORTVERSION= 1.0.53 +PORTVERSION= 1.2 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -16,31 +16,34 @@ MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - ORBit.2:${PORTSDIR}/devel/ORBit \ - Imlib.5:${PORTSDIR}/graphics/imlib \ audiofile.0:${PORTSDIR}/audio/libaudiofile \ esd.2:${PORTSDIR}/audio/esound \ - gnome.3:${PORTSDIR}/x11/gnomelibs \ + Imlib.5:${PORTSDIR}/graphics/imlib \ + ORBit.2:${PORTSDIR}/devel/ORBit \ + gnome.4:${PORTSDIR}/x11/gnomelibs \ gtop.1:${PORTSDIR}/devel/libgtop \ xml.5:${PORTSDIR}/textproc/libxml \ - gnomeprint.9:${PORTSDIR}/print/gnomeprint \ ghttp.1:${PORTSDIR}/www/libghttp \ - obgnome.1:${PORTSDIR}/lang/gnomeobjc \ - glade.3:${PORTSDIR}/devel/libglade -RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio \ - panel:${PORTSDIR}/x11/gnomecore \ - gtcd:${PORTSDIR}/audio/gnomemedia \ + glade.3:${PORTSDIR}/devel/libglade \ + gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ + gnomeprint.9:${PORTSDIR}/print/gnomeprint + +RUN_DEPENDS= ${X11BASE}/share/themes/Metal/ICON.png:${PORTSDIR}/x11-toolkits/gtk-engines \ + another_clock_applet:${PORTSDIR}/x11/gnomeapplets \ + gmc:${PORTSDIR}/x11-fm/gnomemc \ + bug-buddy:${PORTSDIR}/devel/bugbuddy \ + glade:${PORTSDIR}/devel/glade \ + ${LOCALBASE}/lib/python1.5/site-packages/_appletmodule.so:${PORTSDIR}/x11-toolkits/py-gnome \ + ${X11BASE}/share/gnome/help/users-guide/aboutug.html:${PORTSDIR}/misc/gnomeusersguide \ + gcalc:${PORTSDIR}/misc/gnomeutils \ gnomecard:${PORTSDIR}/deskutils/gnomepim \ + ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio \ + gtcd:${PORTSDIR}/audio/gnomemedia \ gnomine:${PORTSDIR}/games/gnomegames \ ElectricEyes:${PORTSDIR}/graphics/electriceyes \ - gcalc:${PORTSDIR}/misc/gnomeutils \ - gtalk:${PORTSDIR}/net/gnomenetwork \ - ggv:${PORTSDIR}/print/ggv \ - gulp:${PORTSDIR}/sysutils/gnomeadmin \ - gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter \ + gnumeric:${PORTSDIR}/math/gnumeric \ gtop:${PORTSDIR}/sysutils/gtop \ - gmc:${PORTSDIR}/x11-fm/gnomemc \ - gnumeric:${PORTSDIR}/math/gnumeric + ggv:${PORTSDIR}/print/ggv NO_BUILD= yes diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile index f9c4255310ff..865b75f73b2d 100644 --- a/x11/gnomecore/Makefile +++ b/x11/gnomecore/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomecore -PORTVERSION= 1.0.55 +PORTVERSION= 1.2.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-core @@ -14,10 +14,8 @@ DISTNAME= gnome-core-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio -LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop \ - gnomeprint.9:${PORTSDIR}/print/gnomeprint \ - ghttp.1:${PORTSDIR}/www/libghttp +LIB_DEPENDS= capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \ + gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -26,10 +24,12 @@ USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} \ --with-kde-datadir=${LOCALBASE}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" +MAN1= gnome-session.1 gnome-wm.1 save-session.1 +MAN5= default.session.5 + .include <bsd.port.mk> diff --git a/x11/gnomecore/distinfo b/x11/gnomecore/distinfo index 8986f909a24a..4056cf2a8ada 100644 --- a/x11/gnomecore/distinfo +++ b/x11/gnomecore/distinfo @@ -1 +1 @@ -MD5 (gnome-core-1.0.55.tar.gz) = 62d51688e02b1b5f7b765891e4f80089 +MD5 (gnome-core-1.2.0.tar.gz) = dc43e5e45df7d7c10e4f9ad52a8ef823 diff --git a/x11/gnomecore/files/patch-aa b/x11/gnomecore/files/patch-aa index 6fc92a3d6671..f4586c109eec 100644 --- a/x11/gnomecore/files/patch-aa +++ b/x11/gnomecore/files/patch-aa @@ -1,15 +1,6 @@ ---- configure.orig Fri Apr 9 18:03:33 1999 -+++ configure Sat May 22 21:21:21 1999 -@@ -3122,7 +3122,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- PTHREAD_LIB="-lc_r" -+ PTHREAD_LIB="" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create""... $ac_c" 1>&6 -@@ -5098,7 +5098,7 @@ +--- configure.orig Tue May 23 00:35:01 2000 ++++ configure Fri May 26 14:29:09 2000 +@@ -4885,7 +4885,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -18,11 +9,22 @@ fi rm -f conftest* INSTOBJEXT=.mo -@@ -6269,6 +6269,7 @@ - case "$host" in - *linux*) CDROM_HOST=linux;; - *solaris*) CDROM_HOST=solaris;; -+*freebsd*) CDROM_HOST=freebsd;; - esac - +--- app-docs.make.orig Thu Apr 20 02:25:57 2000 ++++ app-docs.make Fri May 26 16:31:01 2000 +@@ -1,4 +1,4 @@ +-helpdir = $(datadir)/gnome/help/$(app)/$(lang) ++helpdir = $(datadir)/help/$(app)/$(lang) + help_DATA = \ + index.html \ + topic.dat \ +--- applet-docs.make.orig Thu Apr 20 02:25:57 2000 ++++ applet-docs.make Fri May 26 16:31:10 2000 +@@ -9,7 +9,7 @@ + # figs = modemlights-advpref.png modemlights-prefs.png modemlights.png + # include $(top_srcdir)/applet-docs.make +-docdir = $(datadir)/gnome/help/$(applet)_applet/$(lang) ++docdir = $(datadir)/help/$(applet)_applet/$(lang) + doc_DATA = \ + index.html \ + topic.dat \ diff --git a/x11/gnomecore/files/patch-ab b/x11/gnomecore/files/patch-ab index abaa03ca82de..72fcc097dcd6 100644 --- a/x11/gnomecore/files/patch-ab +++ b/x11/gnomecore/files/patch-ab @@ -1,25 +1,26 @@ ---- help-browser/gnome-help-browser.c.orig Tue Dec 29 05:19:41 1998 -+++ help-browser/gnome-help-browser.c Tue Dec 29 05:20:50 1998 -@@ -72,13 +72,10 @@ +--- help-browser/gnome-help-browser.c.orig Sat May 13 12:16:14 2000 ++++ help-browser/gnome-help-browser.c Fri May 26 14:31:15 2000 +@@ -81,14 +81,10 @@ void destroy_server(HelpWindow win); /* MANPATH should probably come from somewhere */ --#define DEFAULT_MANPATH "/usr/man:/usr/local/man:/usr/X11R6/man" --#define DEFAULT_INFOPATH "/usr/info:/usr/local/info" -+#define DEFAULT_MANPATH "/usr/share/man:/usr/local/man:/usr/X11R6/man" -+#define DEFAULT_INFOPATH "/usr/share/info:/usr/local/info:/usr/X11R6/info" +-#define DEFAULT_MANPATH GNOME_PREFIX "/man:/usr/man:/usr/share/man:/usr/local/man:/usr/X11R6/man" +-#define DEFAULT_INFOPATH GNOME_PREFIX "/info:/usr/info:/usr/share/info:/usr/local/info" ++#define DEFAULT_MANPATH "/usr/share/man:/usr/local/man:/usr/X11R6/man" ++#define DEFAULT_INFOPATH "/usr/share/info:/usr/local/info:/usr/X11R6/info" /* GHELPPATH probably needs some automatic additions inside toc */ --#define DEFAULT_GHELPPATH GNOMEHELPPATH ":/opt/gnome/share/gnome/help:" \ +-#define DEFAULT_GHELPPATH GNOME_PREFIX "/share/gnome/help:" \ +- "/opt/gnome/share/gnome/help:" \ - "/usr/local/share/gnome/help:" \ - "/usr/local/gnome/share/gnome/help:" \ -- "/usr/share/gnome/help:" -+#define DEFAULT_GHELPPATH GNOMEHELPPATH +- "/usr/share/gnome/help" ++#define DEFAULT_GHELPPATH GNOME_PREFIX "/share/gnome/help" #define DEFAULT_MEMCACHESIZE "1000000" #define DEFAULT_HISTORYLENGTH "1000" #define HELP_BROWSER_RC_DIR ".gnome-help-browser" ---- help-browser/toc.c.orig Tue Dec 29 05:20:55 1998 -+++ help-browser/toc.c Tue Dec 29 05:21:48 1998 -@@ -19,14 +19,13 @@ +--- help-browser/toc.c.orig Thu May 4 06:54:33 2000 ++++ help-browser/toc.c Fri May 26 14:32:55 2000 +@@ -20,14 +20,13 @@ static int hideTocInt(GtkWidget *window); struct _toc_config toc_config[] = { @@ -33,9 +34,225 @@ - { "/usr/local/gnome/share/gnome/help", TOC_GHELP_TYPE }, - { "/usr/share/gnome/help", TOC_GHELP_TYPE }, + { "/usr/share/info", TOC_INFO_TYPE }, -+ { "/usr/local/info", TOC_INFO_TYPE }, -+ { "/usr/X11R6/info", TOC_INFO_TYPE }, -+ { "/usr/X11R6/share/gnome/help", TOC_GHELP_TYPE }, ++ { "/usr/local/info", TOC_INFO_TYPE }, ++ { "/usr/X11R6/info", TOC_INFO_TYPE }, ++ { "/usr/X11R6/share/gnome/help", TOC_GHELP_TYPE }, { NULL, 0 } }; +--- help-browser/Makefile.in.orig Tue May 23 04:25:07 2000 ++++ help-browser/Makefile.in Fri May 26 16:15:53 2000 +@@ -143,7 +143,7 @@ + + @HELP_USE_GTKHTML_TRUE@htmlcflags = -DHELP_USE_GTKHTML + +-INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOME_PREFIX=\""$(prefix)\"" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" $(htmlcflags) ++INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOME_PREFIX=\""$(prefix)\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" $(htmlcflags) + + @HELP_USE_GTKHTML_TRUE@htmllibs = $(GNOME_XML_LIB) @PIXBUF_LIBS@ $(GTK_HTML_PREFIX)/lib/libgtkhtml.a $(GNOME_PRINT_PREFIX)/lib/libgnomeprint.a + @HELP_USE_GTKHTML_FALSE@htmllibs = $(GTKXMHTML_LIBS) +@@ -186,7 +186,7 @@ + gnorbadir = $(sysconfdir)/CORBA/servers + gnorba_DATA = help-browser.gnorba + +-sysdir = $(datadir)/gnome/apps ++sysdir = $(datadir)/apps + sys_DATA = gnome-help.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +@@ -558,7 +558,7 @@ + help-caller.o gnome-help-browser.o: help-browser.h + + install-exec-local: +- $(INSTALL_PROGRAM) $(top_srcdir)/help-browser/gnome-download \ ++ $(INSTALL_SCRIPT) $(top_srcdir)/help-browser/gnome-download \ + $(top_srcdir)/help-browser/gnome-convert $(DESTDIR)$(bindir)/ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +--- help-browser/help/C/Makefile.in.orig Tue May 23 04:25:10 2000 ++++ help-browser/help/C/Makefile.in Fri May 26 15:36:46 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/C ++help_browser_helpdir = $(datadir)/help/help-browser/C + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/ca/Makefile.in.orig Tue May 23 04:25:11 2000 ++++ help-browser/help/ca/Makefile.in Fri May 26 15:36:57 2000 +@@ -143,7 +143,7 @@ + + EXTRA_DIST = default-page.html + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/ca ++help_browser_helpdir = $(datadir)/help/help-browser/ca + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/da/Makefile.in.orig Tue May 23 04:25:12 2000 ++++ help-browser/help/da/Makefile.in Fri May 26 15:37:09 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/da ++help_browser_helpdir = $(datadir)/help/help-browser/da + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/el/Makefile.in.orig Tue May 23 04:25:13 2000 ++++ help-browser/help/el/Makefile.in Fri May 26 15:37:16 2000 +@@ -143,7 +143,7 @@ + + EXTRA_DIST = default-page.html + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/el ++help_browser_helpdir = $(datadir)/help/help-browser/el + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/es/Makefile.in.orig Tue May 23 04:25:14 2000 ++++ help-browser/help/es/Makefile.in Fri May 26 15:37:46 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/es ++help_browser_helpdir = $(datadir)/help/help-browser/es + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/et/Makefile.in.orig Tue May 23 04:25:15 2000 ++++ help-browser/help/et/Makefile.in Fri May 26 15:37:53 2000 +@@ -143,7 +143,7 @@ + + EXTRA_DIST = default-page.html + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/et ++help_browser_helpdir = $(datadir)/help/help-browser/et + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/eu/Makefile.in.orig Tue May 23 04:25:16 2000 ++++ help-browser/help/eu/Makefile.in Fri May 26 15:38:00 2000 +@@ -143,7 +143,7 @@ + + EXTRA_DIST = default-page.html + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/eu ++help_browser_helpdir = $(datadir)/help/help-browser/eu + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/fr/Makefile.in.orig Tue May 23 04:25:17 2000 ++++ help-browser/help/fr/Makefile.in Fri May 26 15:38:09 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/fr ++help_browser_helpdir = $(datadir)/help/help-browser/fr + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/gl/Makefile.in.orig Tue May 23 04:25:18 2000 ++++ help-browser/help/gl/Makefile.in Fri May 26 15:38:16 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/gl ++help_browser_helpdir = $(datadir)/help/help-browser/gl + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/hu/Makefile.in.orig Tue May 23 04:25:18 2000 ++++ help-browser/help/hu/Makefile.in Fri May 26 15:38:25 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html sample-help.html sample-topic.dat + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/hu ++help_browser_helpdir = $(datadir)/help/help-browser/hu + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/it/Makefile.in.orig Tue May 23 04:25:19 2000 ++++ help-browser/help/it/Makefile.in Fri May 26 15:38:37 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/it ++help_browser_helpdir = $(datadir)/help/help-browser/it + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/ja/Makefile.in.orig Tue May 23 04:25:20 2000 ++++ help-browser/help/ja/Makefile.in Fri May 26 15:38:47 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html sample-help.html sample-topic.dat + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/ja ++help_browser_helpdir = $(datadir)/help/help-browser/ja + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/ko/Makefile.in.orig Tue May 23 04:25:21 2000 ++++ help-browser/help/ko/Makefile.in Fri May 26 15:38:54 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/ko ++help_browser_helpdir = $(datadir)/help/help-browser/ko + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/lt/Makefile.in.orig Tue May 23 04:25:22 2000 ++++ help-browser/help/lt/Makefile.in Fri May 26 15:39:03 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/lt ++help_browser_helpdir = $(datadir)/help/help-browser/lt + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/no/Makefile.in.orig Tue May 23 04:25:24 2000 ++++ help-browser/help/no/Makefile.in Fri May 26 15:39:12 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/no ++help_browser_helpdir = $(datadir)/help/help-browser/no + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/uk/Makefile.in.orig Tue May 23 04:25:25 2000 ++++ help-browser/help/uk/Makefile.in Fri May 26 15:39:19 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/uk ++help_browser_helpdir = $(datadir)/help/help-browser/uk + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/wa/Makefile.in.orig Tue May 23 04:25:26 2000 ++++ help-browser/help/wa/Makefile.in Fri May 26 15:39:27 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/wa ++help_browser_helpdir = $(datadir)/help/help-browser/wa + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae index 1ea686cf1c6d..797996b9e47a 100644 --- a/x11/gnomecore/files/patch-ae +++ b/x11/gnomecore/files/patch-ae @@ -1,713 +1,73 @@ ---- applets/Makefile.in.orig Thu Sep 23 03:52:47 1999 -+++ applets/Makefile.in Fri Sep 24 10:59:30 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol drivemount clockmail fifteen life battery charpick gnome-pager mini-commander gkb jbc another_clock desk-guide tasklist -+always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol clockmail fifteen life battery charpick gnome-pager mini-commander gkb jbc another_clock desk-guide tasklist - - @FALSE_TRUE@esdmanager = esd-manager - @FALSE_FALSE@esdmanager = ---- applets/asclock/Makefile.in.orig Sat Apr 10 01:11:04 1999 -+++ applets/asclock/Makefile.in Thu May 6 07:47:12 1999 -@@ -156,7 +156,7 @@ - - SUBDIRS = themes default_theme - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DASCLOCK_THEMES_DIR=\""$(datadir)/asclock/"\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DASCLOCK_GNOME -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DASCLOCK_THEMES_DIR=\""$(datadir)/asclock/"\" -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DASCLOCK_GNOME -DVERSION=\""$(VERSION)"\" - - - bin_PROGRAMS = asclock_applet ---- applets/battery/Makefile.in.orig Tue Mar 2 01:54:01 1999 -+++ applets/battery/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = battery_applet ---- applets/cdplayer/Makefile.in.orig Tue Mar 2 01:54:53 1999 -+++ applets/cdplayer/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = cdplayer_applet ---- applets/charpick/Makefile.in.orig Tue Mar 2 01:54:05 1999 -+++ applets/charpick/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = charpick_applet ---- applets/clockmail/Makefile.in.orig Tue Mar 2 01:53:53 1999 -+++ applets/clockmail/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = clockmail_applet ---- applets/cpumemusage/Makefile.in.orig Thu Sep 23 03:54:10 1999 -+++ applets/cpumemusage/Makefile.in Fri Sep 24 11:01:36 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) - - - bin_PROGRAMS = cpumemusage_applet ---- applets/desk-guide/Makefile.in.orig Thu Sep 23 03:54:03 1999 -+++ applets/desk-guide/Makefile.in Fri Sep 24 11:03:26 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ +--- applets/gen_util/mailcheck.c.orig Thu May 18 03:16:03 2000 ++++ applets/gen_util/mailcheck.c Fri May 26 15:08:01 2000 +@@ -1296,7 +1296,7 @@ + if (!user) + return NULL; + +- mc->mail_file = g_strdup_printf ("/var/spool/mail/%s", ++ mc->mail_file = g_strdup_printf ("/var/mail/%s", + user); + } else + mc->mail_file = g_strdup (mc->mail_file); +--- applets/desk-guide/Makefile.in.orig Tue May 23 04:25:59 2000 ++++ applets/desk-guide/Makefile.in Fri May 26 15:21:53 2000 +@@ -141,7 +141,7 @@ + + SUBDIRS = help -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" +INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" bin_PROGRAMS = deskguide_applet ---- applets/dialer/Makefile.in.orig Tue Mar 2 01:53:41 1999 -+++ applets/dialer/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" - - - bin_PROGRAMS = dialer_applet ---- applets/diskusage/Makefile.in.orig Tue Mar 2 01:54:40 1999 -+++ applets/diskusage/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) - - - bin_PROGRAMS = diskusage_applet ---- applets/drivemount/Makefile.in.orig Tue Mar 2 01:53:49 1999 -+++ applets/drivemount/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = drivemount_applet ---- applets/esd-manager/Makefile.in.orig Tue Mar 2 01:54:35 1999 -+++ applets/esd-manager/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ +--- applets/fish/Makefile.in.orig Tue May 23 04:26:04 2000 ++++ applets/fish/Makefile.in Fri May 26 16:23:15 2000 +@@ -139,7 +139,7 @@ + gnomelocaledir = @gnomelocaledir@ l = @l@ --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(shell esd-config --cflags) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(shell esd-config --cflags) +-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @PIXBUF_CFLAGS@ ++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @PIXBUF_CFLAGS@ - bin_PROGRAMS = esdmanager_applet ---- applets/fifteen/Makefile.in.orig Tue Mar 2 01:53:57 1999 -+++ applets/fifteen/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = fifteen_applet ---- applets/fish/Makefile.in.orig Tue Mar 2 01:53:38 1999 -+++ applets/fish/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ + SUBDIRS = help +@@ -187,7 +187,7 @@ --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) + DEFS = @DEFS@ -I. -I$(srcdir) -I../.. + LIBS = @LIBS@ +-libfish_applet_la_LDFLAGS = ++libfish_applet_la_LDFLAGS = -version-info 4:0:0 + libfish_applet_la_LIBADD = + libfish_applet_la_OBJECTS = fish.lo + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +--- applets/gen_util/Makefile.in.orig Tue May 23 04:26:11 2000 ++++ applets/gen_util/Makefile.in Fri May 26 16:23:39 2000 +@@ -141,7 +141,7 @@ - - #if DO_EXE ---- applets/fvwm-pager/Makefile.in.orig Tue Mar 2 01:55:08 1999 -+++ applets/fvwm-pager/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -153,9 +153,9 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --Utilitiesdir = $(datadir)/gnome/apps/Utilities -+Utilitiesdir = $(datadir)/apps/Utilities - --INCLUDES = -Dsafemalloc=g_malloc -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -Dsafemalloc=g_malloc -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = fvwm-pager ---- applets/gen_util/Makefile.in.orig Tue Mar 2 01:53:32 1999 -+++ applets/gen_util/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ + SUBDIRS = help -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - bin_PROGRAMS = gen_util_applet ---- applets/gkb/Makefile.in.orig Tue Mar 2 01:54:21 1999 -+++ applets/gkb/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - #if DO_EXE ---- applets/gnome-pager/Makefile.in.orig Tue Mar 2 01:54:08 1999 -+++ applets/gnome-pager/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" - - - bin_PROGRAMS = gnomepager_applet ---- applets/mini-commander/docs/Makefile.in.orig Sun Oct 3 16:35:27 1999 -+++ applets/mini-commander/docs/Makefile.in Mon Oct 4 13:24:50 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --docdir = $(datadir)/gnome/help/mini-commander_applet/C -+docdir = $(datadir)/help/mini-commander_applet/C - doc_DATA = index.html topic.dat - - -@@ -238,7 +238,7 @@ - install: install-am - uninstall-am: uninstall-docDATA - uninstall: uninstall-am --all-am: Makefile $(DATA) -+all-am: Makefile - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ---- applets/mini-commander/src/Makefile.in.orig Tue Mar 2 01:54:14 1999 -+++ applets/mini-commander/src/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(top_srcdir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(top_srcdir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = mini_commander_applet ---- applets/mixer/Makefile.in.orig Tue Mar 2 01:54:57 1999 -+++ applets/mixer/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = mixer_applet ---- applets/modemlights/Makefile.in.orig Tue Mar 2 01:55:01 1999 -+++ applets/modemlights/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" - - - bin_PROGRAMS = modemlights_applet ---- applets/multiload/Makefile.in.orig Tue Mar 2 01:54:44 1999 -+++ applets/multiload/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_builddir)/panel -I$(srcdir)/../../panel -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) -+INCLUDES = -I. -I$(srcdir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_builddir)/panel -I$(srcdir)/../../panel -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) - - - bin_PROGRAMS = multiload_applet ---- applets/netload/Makefile.in.orig Tue Mar 2 01:54:46 1999 -+++ applets/netload/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) - - - bin_PROGRAMS = netload_applet ---- applets/slashapp/Makefile.in.orig Tue Mar 2 01:54:49 1999 -+++ applets/slashapp/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = slash_applet ---- applets/tasklist/Makefile.in.orig Thu Sep 23 03:54:05 1999 -+++ applets/tasklist/Makefile.in Fri Sep 24 11:04:32 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(srcdir)/../desk-guide -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(srcdir)/../desk-guide -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" - - - bin_PROGRAMS = tasklist_applet ---- applets/webcontrol/Makefile.in.orig Tue Mar 2 01:53:45 1999 -+++ applets/webcontrol/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = webcontrol_applet ---- applets/winlist/Makefile.in.orig Tue Mar 2 01:55:05 1999 -+++ applets/winlist/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = winlist_applet ---- core-docs/Makefile.in.orig Tue Mar 2 01:52:59 1999 -+++ core-docs/Makefile.in Sat Mar 6 17:59:43 1999 -@@ -162,7 +162,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --gnome_intro_helpdir = $(datadir)/gnome/help/gnome-intro/C -+gnome_intro_helpdir = $(datadir)/help/gnome-intro/C - - GNOME_INTRO_HTML_FILES = gnome-intro/c93191.html gnome-intro/f13.html gnome-intro/a-sample-session.html gnome-intro/c93230.html gnome-intro/f1346.html gnome-intro/a-sample-session75.html gnome-intro/c93302.html gnome-intro/gnome-intro.html gnome-intro/c93.html gnome-intro/c93372.html gnome-intro/c93127.html gnome-intro/c93412.html gnome-intro/c93175.html gnome-intro/docbook.css - ---- desktop-links/Makefile.in.orig Tue Mar 2 01:52:28 1999 -+++ desktop-links/Makefile.in Sat Mar 6 17:59:43 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --appsdir = $(datadir)/gnome/apps -+appsdir = $(datadir)/apps - - Rootdir = $(appsdir) - Applicationsdir = $(appsdir)/Applications ---- gmenu/Makefile.in.orig Tue Mar 2 01:53:06 1999 -+++ gmenu/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gmenu -@@ -167,7 +167,7 @@ - - EXTRA_DIST = gmenu.desktop top.xpm folder.xpm unknown.xpm - --sysdir = $(datadir)/gnome/apps/Settings -+sysdir = $(datadir)/apps/Settings - sys_DATA = gmenu.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h ---- gnome-terminal/C/Makefile.in.orig Tue Mar 2 01:52:56 1999 -+++ gnome-terminal/C/Makefile.in Sat Mar 6 17:59:43 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/C -+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/C - - gnome_terminal_help_DATA = index.html topic.dat - ---- gnome-terminal/da/Makefile.in.orig Fri Dec 17 16:27:57 1999 -+++ gnome-terminal/da/Makefile.in Mon Dec 27 13:30:32 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/da -+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/da - - gnome_terminal_help_DATA = index.html topic.dat - ---- gnome-terminal/es/Makefile.in.orig Fri Dec 17 16:28:04 1999 -+++ gnome-terminal/es/Makefile.in Mon Dec 27 13:30:53 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/es -+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/es - - gnome_terminal_help_DATA = index.html topic.dat - ---- gnome-terminal/no/Makefile.in.orig Fri Dec 17 16:28:12 1999 -+++ gnome-terminal/no/Makefile.in Mon Dec 27 13:31:07 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/no -+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/no - - gnome_terminal_help_DATA = index.html topic.dat - ---- gnome-terminal/Makefile.in.orig Tue Mar 2 01:52:55 1999 -+++ gnome-terminal/Makefile.in Sat Mar 6 18:05:08 1999 -@@ -155,9 +155,9 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - - SUBDIRS = C da es no - --INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -+INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" - - - LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(ZVT_LIBS) $(INTLLIBS) -@@ -174,7 +174,7 @@ - - CFLAGS = @CFLAGS@ -Wall - --utildir = $(datadir)/gnome/apps/Utilities -+utildir = $(datadir)/apps/Utilities - util_DATA = gnome-terminal.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h ---- gsm/Makefile.in.orig Thu Sep 23 03:51:28 1999 -+++ gsm/Makefile.in Fri Sep 24 11:33:32 1999 -@@ -153,9 +153,9 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --defaultdir = $(datadir)/gnome -+defaultdir = $(datadir) - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DDEFAULTDIR="\"$(defaultdir)\"" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DDEFAULTDIR="\"$(datadir)\"" - - - LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) -@@ -178,7 +178,7 @@ - - default_DATA = default.session default.wm - --desktopdir = $(datadir)/gnome/apps/Settings -+desktopdir = $(datadir)/apps/Settings - desktop_DATA = save-session.desktop session.desktop - - EXTRA_DIST = default.in default.wm.in gnome-wm save-session.desktop session.desktop ---- help-browser/Makefile.in.orig Tue Mar 2 01:52:32 1999 -+++ help-browser/Makefile.in Sat Mar 6 17:59:43 1999 -@@ -156,7 +156,7 @@ - - SUBDIRS = help gnome-man2html gnome-info2html - --INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/help\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DVERSION=\""$(VERSION)"\" - - - LDADD = -lgnorba $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(ORBIT_LIBS) $(INTLLIBS) -@@ -197,7 +197,7 @@ - gnorbadir = $(sysconfdir)/CORBA/servers - gnorba_DATA = help-browser.gnorba - --sysdir = $(datadir)/gnome/apps -+sysdir = $(datadir)/apps - sys_DATA = gnome-help.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h ---- help-browser/help/C/Makefile.in.orig Tue Mar 2 01:52:38 1999 -+++ help-browser/help/C/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -157,7 +157,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/C -+help_browser_helpdir = $(datadir)/help/help-browser/C - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/ca/Makefile.in.orig Thu Sep 23 03:52:01 1999 -+++ help-browser/help/ca/Makefile.in Fri Sep 24 11:29:22 1999 -@@ -157,7 +157,7 @@ - - EXTRA_DIST = default-page.html - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/ca -+help_browser_helpdir = $(datadir)/help/help-browser/ca - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/da/Makefile.in.orig Fri Dec 17 16:26:15 1999 -+++ help-browser/help/da/Makefile.in Mon Dec 27 13:50:51 1999 -@@ -157,7 +157,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/da -+help_browser_helpdir = $(datadir)/help/help-browser/da - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/el/Makefile.in.orig Fri Dec 17 16:26:21 1999 -+++ help-browser/help/el/Makefile.in Mon Dec 27 13:51:00 1999 -@@ -158,7 +158,7 @@ - - EXTRA_DIST = default-page.html - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/el -+help_browser_helpdir = $(datadir)/help/help-browser/el - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/es/Makefile.in.orig Tue Mar 2 01:52:41 1999 -+++ help-browser/help/es/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -157,7 +157,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/es -+help_browser_helpdir = $(datadir)/help/help-browser/es - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/et/Makefile.in.orig Thu Sep 23 03:52:05 1999 -+++ help-browser/help/et/Makefile.in Fri Sep 24 11:29:43 1999 -@@ -157,7 +157,7 @@ - - EXTRA_DIST = default-page.html - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/et -+help_browser_helpdir = $(datadir)/help/help-browser/et - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/eu/Makefile.in.orig Thu Sep 23 03:52:06 1999 -+++ help-browser/help/eu/Makefile.in Fri Sep 24 11:29:56 1999 -@@ -157,7 +157,7 @@ - - EXTRA_DIST = default-page.html - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/eu -+help_browser_helpdir = $(datadir)/help/help-browser/eu - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/fr/Makefile.in.orig Tue Mar 2 01:52:43 1999 -+++ help-browser/help/fr/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -157,7 +157,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/fr -+help_browser_helpdir = $(datadir)/help/help-browser/fr - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/hu/Makefile.in.orig Tue Mar 2 01:52:44 1999 -+++ help-browser/help/hu/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -157,7 +157,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/hu -+help_browser_helpdir = $(datadir)/help/help-browser/hu - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/it/Makefile.in.orig Tue Mar 2 01:52:46 1999 -+++ help-browser/help/it/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -157,7 +157,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/it -+help_browser_helpdir = $(datadir)/help/help-browser/it - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/ja/Makefile.in.orig Thu Sep 23 03:52:14 1999 -+++ help-browser/help/ja/Makefile.in Fri Sep 24 11:30:09 1999 -@@ -156,7 +156,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html sample-help.html sample-topic.dat - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/ja -+help_browser_helpdir = $(datadir)/help/help-browser/ja - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/ko/Makefile.in.orig Tue Mar 2 01:52:46 1999 -+++ help-browser/help/ko/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -157,7 +157,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/ko -+help_browser_helpdir = $(datadir)/help/help-browser/ko - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/no/Makefile.in.orig Tue Mar 2 01:52:47 1999 -+++ help-browser/help/no/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -157,7 +157,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/no -+help_browser_helpdir = $(datadir)/help/help-browser/no - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/wa/Makefile.in.orig Wed Jun 23 17:38:49 1999 -+++ help-browser/help/wa/Makefile.in Mon Jul 12 14:34:30 1999 -@@ -159,7 +159,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/wa -+help_browser_helpdir = $(datadir)/help/help-browser/wa - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- panel/Makefile.in.orig Fri Dec 17 16:28:45 1999 -+++ panel/Makefile.in Wed Feb 23 13:50:04 2000 -@@ -160,7 +160,7 @@ - - AUTOMAKE_OPTIONS = 1.3 - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) - - - bin_PROGRAMS = panel + lib_LTLIBRARIES = libgen_util_applet.la @@ -181,7 +181,7 @@ - libpanel_appletinclude_HEADERS = applet-widget.h gnome-panel.h - - --libpanel_applet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) -+libpanel_applet_la_LDFLAGS = -version-info 2:0:0 - libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) - - BUILT_SOURCES = $(CORBA_SRCLIST) -@@ -213,7 +213,7 @@ - EXTRA_DIST = panelrc.in panel.in appletsConf.sh.in panel.gnorba panel.soundlist APPLET_WRITING bad-applet.desktop bad-applet.goad - - --confexecdir = $(libdir) -+confexecdir = $(sysconfdir) - confexec_DATA = appletsConf.sh - - panelgnorbadir = $(sysconfdir)/CORBA/servers -@@ -670,6 +670,7 @@ - sed -e 's?\@GNOME_LIBDIR\@?$(GNOME_LIBDIR)?g' \ - -e 's?\@GNOME_INCLUDEDIR\@?$(GNOME_INCLUDEDIR)?g' \ - -e 's?\@GNOMEGNORBA_LIBS\@?$(GNOMEGNORBA_LIBS)?g' \ -+ -e 's?\@VERSION\@?$(VERSION)?g' \ - < $(srcdir)/appletsConf.sh.in > appletsConf.tmp \ - && mv appletsConf.tmp appletsConf.sh - ---- panel/appletsConf.sh.in.orig Mon Feb 8 11:13:15 1999 -+++ panel/appletsConf.sh.in Wed Feb 23 13:52:32 2000 -@@ -4,3 +4,4 @@ - APPLETS_LIBDIR="@GNOME_LIBDIR@" - APPLETS_LIBS="-lpanel_applet @GNOMEGNORBA_LIBS@" - APPLETS_INCLUDEDIR="@GNOME_INCLUDEDIR@" -+MODULE_VERSION="applets-@VERSION@" ---- applets/another_clock/Makefile.in.orig Sat Oct 16 13:03:28 1999 -+++ applets/another_clock/Makefile.in Sat Oct 16 13:03:38 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" + DEFS = @DEFS@ -I. -I$(srcdir) -I../.. + LIBS = @LIBS@ +-libgen_util_applet_la_LDFLAGS = ++libgen_util_applet_la_LDFLAGS = -version-info 4:0:0 + libgen_util_applet_la_LIBADD = + libgen_util_applet_la_OBJECTS = main.lo mailcheck.lo popcheck.lo \ + printer.lo clock.lo +--- applets/tasklist/Makefile.in.orig Tue May 23 04:26:26 2000 ++++ applets/tasklist/Makefile.in Fri May 26 15:24:07 2000 +@@ -141,7 +141,7 @@ + SUBDIRS = help - bin_PROGRAMS = another_clock_applet ---- applets/icewm-pager/Makefile.in.orig Sat Oct 16 13:05:16 1999 -+++ applets/icewm-pager/Makefile.in Sat Oct 16 13:05:53 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" - - - bin_PROGRAMS = wmpager_applet ---- applets/life/Makefile.in.orig Sat Oct 16 13:06:24 1999 -+++ applets/life/Makefile.in Sat Oct 16 13:06:34 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ +-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(srcdir)/../desk-guide -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @PIXBUF_CFLAGS@ ++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(srcdir)/../desk-guide -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @PIXBUF_CFLAGS@ --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - bin_PROGRAMS = life_applet ---- applets/jbc/Makefile.in.orig Sat Oct 16 13:12:59 1999 -+++ applets/jbc/Makefile.in Sat Oct 16 13:13:12 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = jbc_applet + bin_PROGRAMS = tasklist_applet diff --git a/x11/gnomecore/files/patch-ah b/x11/gnomecore/files/patch-ah index 1b86dd17e0d9..afe5c26501d2 100644 --- a/x11/gnomecore/files/patch-ah +++ b/x11/gnomecore/files/patch-ah @@ -1,17 +1,72 @@ ---- gmenu/main.c.orig Thu May 6 11:44:25 1999 -+++ gmenu/main.c Thu May 6 11:44:43 1999 -@@ -271,7 +271,7 @@ - - gnome_init ("GNOME menu editor", VERSION, argc, argv); - -- system_apps_dir = gnome_unconditional_datadir_file("gnome/apps"); -+ system_apps_dir = gnome_unconditional_datadir_file("apps"); - system_pixmap_dir = gnome_unconditional_datadir_file("pixmaps"); - if (!g_file_exists(system_apps_dir) || !g_file_exists(system_pixmap_dir)) - { ---- panel/menu.c.orig Mon Sep 20 18:49:14 1999 -+++ panel/menu.c Fri Sep 24 10:55:55 1999 -@@ -504,7 +504,7 @@ +--- panel/Makefile.in.orig Tue May 23 04:25:47 2000 ++++ panel/Makefile.in Fri May 26 15:30:48 2000 +@@ -147,7 +147,7 @@ + + SUBDIRS = doc help + +-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) @PIXBUF_CFLAGS@ ++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) @PIXBUF_CFLAGS@ + + + bin_PROGRAMS = panel gnome-panel-properties-capplet +@@ -169,7 +169,7 @@ + libpanel_appletinclude_HEADERS = applet-widget.h gnome-panel.h + + +-libpanel_applet_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir) ++libpanel_applet_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) + libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) + + libpanel_status_la_SOURCES = status-docklet.c $(CORBA_SRCLIST) +@@ -178,7 +178,7 @@ + libpanel_statusinclude_HEADERS = status-docklet.h + + +-libpanel_status_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) ++libpanel_status_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) + libpanel_status_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) + + BUILT_SOURCES = $(CORBA_SRCLIST) +@@ -210,7 +210,7 @@ + EXTRA_DIST = panelrc.in panel.in appletsConf.sh.in dockletsConf.sh.in panel.gnorba panel.soundlist APPLET_WRITING panel.hints gnome-panel-properties.desktop nothing.cP title-item.gob + + +-confexecdir = $(libdir) ++confexecdir = $(sysconfdir) + confexec_DATA = appletsConf.sh dockletsConf.sh + + panelgnorbadir = $(sysconfdir)/CORBA/servers +@@ -219,13 +219,13 @@ + soundlistdir = $(sysconfdir)/sound/events + soundlist_DATA = panel.soundlist + +-hintsdir = $(datadir)/gnome/hints ++hintsdir = $(datadir)/hints + hints_DATA = panel.hints + + sysdir = $(datadir)/control-center/Desktop/ + sys_DATA = gnome-panel-properties.desktop + +-deskdir = $(datadir)/gnome/apps/Settings/Desktop/ ++deskdir = $(datadir)/apps/Settings/Desktop/ + desk_DATA = gnome-panel-properties.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + +--- panel/foobar-widget.c.orig Sat May 6 20:48:27 2000 ++++ panel/foobar-widget.c Wed May 31 12:51:56 2000 +@@ -557,7 +557,7 @@ + + append_folder_menu (menu_bar, _("Favorites"), NULL, FALSE, "apps/."); + append_folder_menu (menu_bar, _("Settings"), NULL, TRUE, +- "gnome/apps/Settings/."); ++ "apps/Settings/."); + append_desktop_menu (menu_bar); + + gtk_box_pack_start (GTK_BOX (foo->hbox), menu_bar, FALSE, FALSE, 0); +--- panel/menu.c.orig Tue May 23 01:00:43 2000 ++++ panel/menu.c Fri May 26 15:10:21 2000 +@@ -82,7 +82,7 @@ /*just load the menus from disk, don't make the widgets this just reads the .desktops of the top most directory and a level down*/ @@ -20,39 +75,62 @@ if(menu) fr_read_dir(NULL,menu,NULL,2); g_free(menu); -@@ -2078,7 +2078,7 @@ - static GtkWidget * - create_system_menu(GtkWidget *menu, int fake_submenus, int fake) +@@ -2709,7 +2709,7 @@ + create_system_menu(GtkWidget *menu, gboolean fake_submenus, gboolean fake, + gboolean title) + { +- char *menudir = gnome_datadir_file ("gnome/apps"); ++ char *menudir = gnome_datadir_file ("apps"); + + if (menudir && + g_file_test (menudir, G_FILE_TEST_ISDIR)) { +@@ -3598,8 +3598,8 @@ + gtk_menu_append (GTK_MENU (submenu), submenuitem); + gtk_signal_connect(GTK_OBJECT(submenuitem), "activate", + GTK_SIGNAL_FUNC(add_menu_to_panel), +- "gnome/apps/"); +- setup_internal_applet_drag(submenuitem, "MENU:gnome/apps/"); ++ "apps/"); ++ setup_internal_applet_drag(submenuitem, "MENU:apps/"); + + submenuitem = gtk_menu_item_new (); + gtk_widget_lock_accelerators (menuitem); +--- panel/menu-properties.c.orig Mon Apr 3 18:03:29 2000 ++++ panel/menu-properties.c Wed May 31 12:50:41 2000 +@@ -40,7 +40,7 @@ + arguments = "."; + + if(strcmp(arguments,".")==0) +- this_menu = gnome_unconditional_datadir_file ("gnome/apps"); ++ this_menu = gnome_unconditional_datadir_file ("apps"); + else if (*arguments == '/') + this_menu = g_strdup (arguments); + else if (*arguments == '~') +--- panel/session.c.orig Fri May 19 00:29:47 2000 ++++ panel/session.c Wed May 31 12:49:09 2000 +@@ -777,10 +777,10 @@ + load_default_applets1(PanelWidget *panel) { -- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps"); -+ char *menu_base = gnome_unconditional_datadir_file ("apps"); - char *menudir, *pixmap; - - menudir = g_concat_dir_and_file (menu_base, "."); -@@ -3111,7 +3111,7 @@ - current_panel = PANEL_WIDGET(menu->button->parent); - - if(!menu->menu) { -- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps"); -+ char *menu_base = gnome_unconditional_datadir_file ("apps"); - char *this_menu = get_real_menu_path(menu->path,menu_base); - GSList *list = g_slist_append(NULL,this_menu); - -@@ -3220,7 +3220,7 @@ - Menu *menu; - int main_menu; - -- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps"); -+ char *menu_base = gnome_unconditional_datadir_file ("apps"); - char *this_menu = get_real_menu_path(arguments,menu_base); - - if (!this_menu) { -@@ -3340,7 +3340,7 @@ - menu->menu = NULL; - - { -- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps"); -+ char *menu_base = gnome_unconditional_datadir_file ("apps"); - char *this_menu = get_real_menu_path(menu->path,menu_base); - GSList *list = g_slist_append(NULL,this_menu); - char *pixmap_name = get_pixmap(this_menu, + char *def_launchers[] = +- { "gnome/apps/gnome-help.desktop", +- "gnome/apps/System/gnome-terminal.desktop", +- "gnome/apps/Settings/gnomecc.desktop", +- "gnome/apps/Internet/Netscape.desktop", ++ { "apps/gnome-help.desktop", ++ "apps/System/gnome-terminal.desktop", ++ "apps/Settings/gnomecc.desktop", ++ "apps/Internet/Netscape.desktop", + NULL }; + int i; + char *p; +--- panel/doc/Makefile.in.orig Tue May 23 04:25:49 2000 ++++ panel/doc/Makefile.in Fri May 26 16:45:35 2000 +@@ -150,7 +150,7 @@ + CFLAGS = "`gnome-config --cflags gnomeui applets docklets`" + LDFLAGS = "`gnome-config --libs gnomeui applets docklets`" + +-HTML_DIR = $(datadir)/gnome/html ++HTML_DIR = $(datadir)/html + + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + diff --git a/x11/gnomecore/files/patch-am b/x11/gnomecore/files/patch-am index 5519ed43f554..63410295e912 100644 --- a/x11/gnomecore/files/patch-am +++ b/x11/gnomecore/files/patch-am @@ -1,86 +1,69 @@ ---- gnome-terminal/gnome-terminal.c.orig Thu Nov 11 18:05:12 1999 -+++ gnome-terminal/gnome-terminal.c Thu Jan 20 17:00:49 2000 -@@ -480,6 +480,7 @@ - cfg->color_type = PALETTE_CUSTOM; +--- gnome-terminal/gnome-terminal.c.orig Fri May 19 23:38:07 2000 ++++ gnome-terminal/gnome-terminal.c Fri May 26 15:15:38 2000 +@@ -507,7 +507,7 @@ else cfg->color_type = PALETTE_LINUX; -+ cfg->keyboard_secured = gnome_config_get_bool ("keyboard_secured=0"); - cfg->bell = gnome_config_get_bool ("bell_silenced=0"); - cfg->blink = gnome_config_get_bool ("blinking=0"); - cfg->swap_keys = gnome_config_get_bool ("swap_del_and_backspace=0"); -@@ -507,7 +508,8 @@ - cfg->termname = NULL; - cfg->terminal_id = 0; - -- cfg->update_records = ZVT_TERM_DO_UTMP_LOG|ZVT_TERM_DO_WTMP_LOG; -+ cfg->update_records = ZVT_TERM_DO_UTMP_LOG | ZVT_TERM_DO_WTMP_LOG -+ | ZVT_TERM_DO_LASTLOG; - - if (strcasecmp (fore_color, back_color) == 0) - /* don't let them set identical foreground and background colors */ -@@ -994,6 +996,7 @@ - gnome_config_set_string ("scrollpos", + +- cfg->keyboard_secured = FALSE; ++ cfg->keyboard_secured = gnome_config_get_bool ("keyboard_secured=0"); + + cfg->bell = gnome_config_get_bool ("bell_silenced=0"); + cfg->blink = gnome_config_get_bool ("blinking=0"); +@@ -1028,6 +1028,7 @@ cfg->scrollbar_position == SCROLLBAR_LEFT ? "left" : cfg->scrollbar_position == SCROLLBAR_RIGHT ? "right" : "hidden"); + + gnome_config_set_bool ("keyboard_secured", cfg->keyboard_secured); gnome_config_set_bool ("bell_silenced", cfg->bell); gnome_config_set_bool ("blinking", cfg->blink); gnome_config_set_bool ("swap_del_and_backspace", cfg->swap_keys); -@@ -2260,6 +2263,8 @@ - cfg->update_records |= ZVT_TERM_DO_UTMP_LOG; - if (gnome_config_get_bool ("do_wtmp=true")) - cfg->update_records |= ZVT_TERM_DO_WTMP_LOG; -+ if (gnome_config_get_bool ("do_lastlog=true")) -+ cfg->update_records |= ZVT_TERM_DO_LASTLOG; - - termid = gnome_config_get_int("terminal_id=-1"); - if (termid!=-1) -@@ -2367,6 +2372,7 @@ - gnome_config_set_string("window_title", cfg->window_title?cfg->window_title:"Terminal"); - gnome_config_set_bool("do_utmp", (cfg->update_records & ZVT_TERM_DO_UTMP_LOG) != 0); - gnome_config_set_bool("do_wtmp", (cfg->update_records & ZVT_TERM_DO_WTMP_LOG) != 0); -+ gnome_config_set_bool("do_lastlog", (cfg->update_records & ZVT_TERM_DO_LASTLOG) != 0); - - gnome_config_pop_prefix (); - g_free (prefix); -@@ -2417,8 +2423,10 @@ +@@ -2544,12 +2545,12 @@ DONOUTMP_KEY = -10, DOWTMP_KEY = -11, DONOWTMP_KEY = -12, - TITLE_KEY = -13, -- TERM_KEY = -14 -+ DOLASTLOG_KEY = -13, -+ DONOLASTLOG_KEY = -14, -+ TITLE_KEY = -15, -+ TERM_KEY = -16 +- TERM_KEY = -14, +- START_FACTORY_KEY= -15, +- USE_FACTORY_KEY = -16, +- DOLASTLOG_KEY = -17, +- DONOLASTLOG_KEY = -18, ++ DOLASTLOG_KEY = -13, ++ DONOLASTLOG_KEY = -14, ++ TITLE_KEY = -15, ++ TERM_KEY = -16, ++ START_FACTORY_KEY= -17, ++ USE_FACTORY_KEY = -18 }; static struct poptOption cb_options [] = { -@@ -2462,6 +2470,12 @@ +--- gnome-terminal/Makefile.in.orig Tue May 23 04:25:29 2000 ++++ gnome-terminal/Makefile.in Fri May 26 15:46:43 2000 +@@ -143,7 +143,7 @@ + + SUBDIRS = C de da es it no + +-INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\"" ++INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" + + + LDADD = $(GNOME_LIBDIR) $(GNORBA_LIBS) $(ORB_LIBS) $(GNOMEUI_LIBS) $(ZVT_LIBS) $(INTLLIBS) +@@ -167,7 +167,7 @@ + gnorbadir = $(sysconfdir)/CORBA/servers + gnorba_DATA = gnome-terminal.gnorba + +-utildir = $(datadir)/gnome/apps/System ++utildir = $(datadir)/apps/System + util_DATA = gnome-terminal.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- gnome-terminal/de/Makefile.in.orig Tue May 23 04:25:31 2000 ++++ gnome-terminal/de/Makefile.in Fri May 26 15:53:04 2000 +@@ -139,7 +139,7 @@ + gnomelocaledir = @gnomelocaledir@ + l = @l@ + +-gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/de ++gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/de + + gnome_terminal_help_DATA = index.html topic.dat - { "nowtmp", '\0', POPT_ARG_NONE, NULL, DONOWTMP_KEY, - N_("Do not update wtmp entry"), N_("NOWTMP") }, -+ -+ { "lastlog", '\0', POPT_ARG_NONE, NULL, DOLASTLOG_KEY, -+ N_("Update lastlog entry"), N_("LASTLOG") }, -+ -+ { "nolastlog", '\0', POPT_ARG_NONE, NULL, DONOLASTLOG_KEY, -+ N_("Do not update lastlog entry"), N_("NOLASTLOG") }, - - { "title", 't', POPT_ARG_STRING, NULL, TITLE_KEY, - N_("Set the window title"), N_("TITLE") }, -@@ -2538,6 +2552,14 @@ - case DONOWTMP_KEY: - cfg->update_records_and &= ~ZVT_TERM_DO_WTMP_LOG; - cfg->update_records_xor &= ~ZVT_TERM_DO_WTMP_LOG; -+ break; -+ case DOLASTLOG_KEY: -+ cfg->update_records_and &= ~ZVT_TERM_DO_LASTLOG; -+ cfg->update_records_xor |= ZVT_TERM_DO_LASTLOG; -+ break; -+ case DONOLASTLOG_KEY: -+ cfg->update_records_and &= ~ZVT_TERM_DO_LASTLOG; -+ cfg->update_records_xor &= ~ZVT_TERM_DO_LASTLOG; - break; - case TITLE_KEY: - cfg->window_title = g_strdup(arg); diff --git a/x11/gnomecore/files/patch-an b/x11/gnomecore/files/patch-an new file mode 100644 index 000000000000..79a9c69d2695 --- /dev/null +++ b/x11/gnomecore/files/patch-an @@ -0,0 +1,31 @@ +--- gmenu/Makefile.in.orig Tue May 23 04:25:39 2000 ++++ gmenu/Makefile.in Fri May 26 15:25:26 2000 +@@ -139,7 +139,7 @@ + gnomelocaledir = @gnomelocaledir@ + l = @l@ + +-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) + + + bin_PROGRAMS = gmenu +@@ -152,7 +152,7 @@ + + EXTRA_DIST = gmenu.desktop top.xpm unknown.xpm + +-sysdir = $(datadir)/gnome/apps/Settings ++sysdir = $(datadir)/apps/Settings + sys_DATA = gmenu.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- gmenu/main.c.orig Wed May 10 01:36:16 2000 ++++ gmenu/main.c Fri May 26 15:09:49 2000 +@@ -276,7 +276,7 @@ + gnome_init ("GNOME menu editor", VERSION, argc, argv); + gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-gmenu.png"); + +- system_apps_dir = gnome_datadir_file("gnome/apps"); ++ system_apps_dir = gnome_datadir_file("apps"); + system_applets_dir = gnome_datadir_file("applets"); + system_pixmap_dir = gnome_datadir_file("pixmaps"); + if (!system_apps_dir || !system_pixmap_dir || !system_applets_dir) diff --git a/x11/gnomecore/files/patch-ap b/x11/gnomecore/files/patch-ap new file mode 100644 index 000000000000..a1e81ad131bd --- /dev/null +++ b/x11/gnomecore/files/patch-ap @@ -0,0 +1,23 @@ +--- gsm/Makefile.in.orig Tue May 23 04:24:59 2000 ++++ gsm/Makefile.in Fri May 26 15:28:56 2000 +@@ -141,9 +141,9 @@ + + SUBDIRS = help + +-defaultdir = $(datadir)/gnome ++defaultdir = $(datadir) + +-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DDEFAULTDIR="\"$(defaultdir)\"" ++INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DDEFAULTDIR="\"$(defaultdir)\"" + + + LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) +@@ -169,7 +169,7 @@ + + default_DATA = default.session default.wm + +-desktopdir = $(datadir)/gnome/apps/Settings/Session/ ++desktopdir = $(datadir)/apps/Settings/Session/ + desktop_DATA = save-session.desktop session.desktop + + man_MANS = gnome-wm.1 save-session.1 default.session.5 gnome-session.1 diff --git a/x11/gnomecore/pkg-plist b/x11/gnomecore/pkg-plist index 67a6d9b22ab2..a1013263b4d4 100644 --- a/x11/gnomecore/pkg-plist +++ b/x11/gnomecore/pkg-plist @@ -1,273 +1,218 @@ -bin/another_clock_applet -bin/asclock_applet -bin/battery_applet -bin/cdplayer_applet -bin/charpick_applet -bin/clockmail_applet -bin/cpumemusage_applet bin/deskguide_applet -bin/dialer_applet -bin/diskusage_applet -bin/fifteen_applet -bin/gen_util_applet bin/gmenu +bin/gnome-about +bin/gnome-convert +bin/gnome-download bin/gnome-edit bin/gnome-help-browser bin/gnome-help-caller +bin/gnome-hint +bin/gnome-hint-properties-capplet bin/gnome-info2html bin/gnome-login-check bin/gnome-man2html +bin/gnome-panel-properties-capplet bin/gnome-session bin/gnome-smproxy bin/gnome-terminal bin/gnome-wm -bin/gnomepager_applet -bin/jbc_applet -bin/life_applet -bin/mini_commander_applet -bin/mixer_applet -bin/modemlights_applet -bin/multiload_applet bin/panel bin/save-session bin/session-properties bin/tasklist_applet -bin/webcontrol_applet -etc/CORBA/servers/another_clock_applet.gnorba -etc/CORBA/servers/asclock_applet.gnorba -etc/CORBA/servers/bad-applet.goad -etc/CORBA/servers/battery_applet.gnorba -etc/CORBA/servers/cdplayer_applet.gnorba -etc/CORBA/servers/charpick_applet.gnorba -etc/CORBA/servers/clockmail_applet.gnorba -etc/CORBA/servers/cpumemusage_applet.gnorba etc/CORBA/servers/deskguide_applet.gnorba -etc/CORBA/servers/dialer_applet.gnorba -etc/CORBA/servers/diskusage_applet.gnorba -etc/CORBA/servers/fifteen_applet.gnorba etc/CORBA/servers/fish_applet.gnorba etc/CORBA/servers/gen_util.gnorba -etc/CORBA/servers/gkb_applet.gnorba -etc/CORBA/servers/gnomepager_applet.gnorba +etc/CORBA/servers/gnome-terminal.gnorba etc/CORBA/servers/help-browser.gnorba -etc/CORBA/servers/jbc_applet.gnorba -etc/CORBA/servers/life_applet.gnorba -etc/CORBA/servers/mini-commander_applet.gnorba -etc/CORBA/servers/mixer_applet.gnorba -etc/CORBA/servers/modemlights_applet.gnorba -etc/CORBA/servers/multiload_applet.gnorba etc/CORBA/servers/panel.gnorba etc/CORBA/servers/tasklist_applet.gnorba -etc/CORBA/servers/webcontrol_applet.gnorba etc/appletsConf.sh +etc/dockletsConf.sh +etc/sound/events/mailcheck.soundlist etc/sound/events/panel.soundlist include/applet-widget.h include/gnome-panel.h +include/status-docklet.h lib/libfish_applet.a lib/libfish_applet.so -lib/libfish_applet.so.0 -lib/libgkb_applet.a -lib/libgkb_applet.so -lib/libgkb_applet.so.0 +lib/libfish_applet.so.4 +lib/libgen_util_applet.a +lib/libgen_util_applet.so +lib/libgen_util_applet.so.4 lib/libpanel_applet.a lib/libpanel_applet.so -lib/libpanel_applet.so.2 -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +lib/libpanel_applet.so.4 +lib/libpanel_status.a +lib/libpanel_status.so +lib/libpanel_status.so.4 share/gnome/applets/Amusements/.directory -share/gnome/applets/Amusements/fifteen_applet.desktop share/gnome/applets/Amusements/fish_applet.desktop -share/gnome/applets/Amusements/life_applet.desktop share/gnome/applets/Clocks/.directory -share/gnome/applets/Clocks/another_clock_applet.desktop -share/gnome/applets/Clocks/asclock_applet.desktop share/gnome/applets/Clocks/clock_applet.desktop -share/gnome/applets/Clocks/clockmail_applet.desktop -share/gnome/applets/Clocks/jbc_applet.desktop share/gnome/applets/Monitors/.directory -share/gnome/applets/Monitors/battery_applet.desktop -share/gnome/applets/Monitors/cpuload_applet.desktop -share/gnome/applets/Monitors/cpumemusage_applet.desktop -share/gnome/applets/Monitors/diskusage_applet.desktop -share/gnome/applets/Monitors/memload_applet.desktop -share/gnome/applets/Monitors/swapload_applet.desktop share/gnome/applets/Multimedia/.directory -share/gnome/applets/Multimedia/cdplayer_applet.desktop -share/gnome/applets/Multimedia/mixer_applet.desktop share/gnome/applets/Network/.directory -share/gnome/applets/Network/clockmail_applet.desktop -share/gnome/applets/Network/dialer_applet.desktop share/gnome/applets/Network/mailcheck_applet.desktop -share/gnome/applets/Network/modemlights_applet.desktop -share/gnome/applets/Network/webcontrol_applet.desktop share/gnome/applets/Utility/.directory -share/gnome/applets/Utility/charpick_applet.desktop share/gnome/applets/Utility/deskguide_applet.desktop -share/gnome/applets/Utility/gkb_applet.desktop -share/gnome/applets/Utility/gnomepager_applet.desktop -share/gnome/applets/Utility/mini-commander_applet.desktop share/gnome/applets/Utility/printer.desktop share/gnome/applets/Utility/tasklist_applet.desktop +share/gnome/apps/.directory share/gnome/apps/.order share/gnome/apps/Applications/.directory share/gnome/apps/Applications/Emacs.desktop -share/gnome/apps/Applications/Netscape.desktop +share/gnome/apps/Applications/Vim.desktop +share/gnome/apps/Applications/WordPerfect.desktop +share/gnome/apps/Applications/XEphem.desktop +share/gnome/apps/Applications/Xemacs.desktop +share/gnome/apps/Applications/gaspell.desktop +share/gnome/apps/Development/.directory share/gnome/apps/Games/.directory share/gnome/apps/Gmc.desktop share/gnome/apps/Graphics/.directory share/gnome/apps/Graphics/GIMP.desktop +share/gnome/apps/Graphics/xbmbrowser.desktop +share/gnome/apps/Graphics/xv.desktop share/gnome/apps/Internet/.directory -share/gnome/apps/Internet/Balsa.desktop +share/gnome/apps/Internet/Netscape.desktop +share/gnome/apps/Internet/TkSETI.desktop share/gnome/apps/Internet/Tkrat.desktop +share/gnome/apps/Internet/lynx.desktop share/gnome/apps/Multimedia/.directory share/gnome/apps/Settings/.directory share/gnome/apps/Settings/.order +share/gnome/apps/Settings/Desktop/gnome-panel-properties.desktop share/gnome/apps/Settings/Imlib_config.desktop +share/gnome/apps/Settings/Session/gnome-hint-properties.desktop +share/gnome/apps/Settings/Session/save-session.desktop +share/gnome/apps/Settings/Session/session.desktop share/gnome/apps/Settings/gmenu.desktop -share/gnome/apps/Settings/save-session.desktop -share/gnome/apps/Settings/session.desktop share/gnome/apps/System/.directory +share/gnome/apps/System/Eterm.desktop +share/gnome/apps/System/Kterm.desktop +share/gnome/apps/System/UNIX-regular.desktop +share/gnome/apps/System/UNIX.desktop +share/gnome/apps/System/Vnterm.desktop +share/gnome/apps/System/gnome-terminal.desktop share/gnome/apps/Utilities/.directory -share/gnome/apps/Utilities/Eterm.desktop -share/gnome/apps/Utilities/Kterm.desktop -share/gnome/apps/Utilities/UNIX-regular.desktop -share/gnome/apps/Utilities/UNIX.desktop -share/gnome/apps/Utilities/Vnterm.desktop -share/gnome/apps/Utilities/gnome-terminal.desktop +share/gnome/apps/Utilities/gnome-hint.desktop share/gnome/apps/gnome-help.desktop -share/gnome/asclock/Freeamp/beats.xpm -share/gnome/asclock/Freeamp/clock.xpm -share/gnome/asclock/Freeamp/config -share/gnome/asclock/Freeamp/date.xpm -share/gnome/asclock/Freeamp/hour.xpm -share/gnome/asclock/Freeamp/led.xpm -share/gnome/asclock/Freeamp/minute.xpm -share/gnome/asclock/Freeamp/month.xpm -share/gnome/asclock/Freeamp/second.xpm -share/gnome/asclock/Freeamp/weekday.xpm -share/gnome/asclock/Newstone/beats.xpm -share/gnome/asclock/Newstone/clock.xpm -share/gnome/asclock/Newstone/config -share/gnome/asclock/Newstone/date.xpm -share/gnome/asclock/Newstone/hour.xpm -share/gnome/asclock/Newstone/led.xpm -share/gnome/asclock/Newstone/minute.xpm -share/gnome/asclock/Newstone/month.xpm -share/gnome/asclock/Newstone/second.xpm -share/gnome/asclock/Newstone/weekday.xpm -share/gnome/asclock/Orb/beats.xpm -share/gnome/asclock/Orb/clock.xpm -share/gnome/asclock/Orb/config -share/gnome/asclock/Orb/date.xpm -share/gnome/asclock/Orb/hour.xpm -share/gnome/asclock/Orb/led.xpm -share/gnome/asclock/Orb/minute.xpm -share/gnome/asclock/Orb/month.xpm -share/gnome/asclock/Orb/second.xpm -share/gnome/asclock/Orb/weekday.xpm -share/gnome/asclock/Stone/beats.xpm -share/gnome/asclock/Stone/clock.xpm -share/gnome/asclock/Stone/config -share/gnome/asclock/Stone/date.xpm -share/gnome/asclock/Stone/hour.xpm -share/gnome/asclock/Stone/led.xpm -share/gnome/asclock/Stone/minute.xpm -share/gnome/asclock/Stone/month.xpm -share/gnome/asclock/Stone/second.xpm -share/gnome/asclock/Stone/weekday.xpm -share/gnome/asclock/beats/beats.xpm -share/gnome/asclock/beats/clock.xpm -share/gnome/asclock/beats/config -share/gnome/asclock/beats/date.xpm -share/gnome/asclock/beats/hour.xpm -share/gnome/asclock/beats/led.xpm -share/gnome/asclock/beats/minute.xpm -share/gnome/asclock/beats/month.xpm -share/gnome/asclock/beats/second.xpm -share/gnome/asclock/beats/weekday.xpm -share/gnome/asclock/classic/beats.xpm -share/gnome/asclock/classic/clock.xpm -share/gnome/asclock/classic/config -share/gnome/asclock/classic/date.xpm -share/gnome/asclock/classic/hour.xpm -share/gnome/asclock/classic/led.xpm -share/gnome/asclock/classic/minute.xpm -share/gnome/asclock/classic/month.xpm -share/gnome/asclock/classic/second.xpm -share/gnome/asclock/classic/weekday.xpm -share/gnome/asclock/shaped/beats.xpm -share/gnome/asclock/shaped/clock.xpm -share/gnome/asclock/shaped/config -share/gnome/asclock/shaped/date.xpm -share/gnome/asclock/shaped/hour.xpm -share/gnome/asclock/shaped/led.xpm -share/gnome/asclock/shaped/minute.xpm -share/gnome/asclock/shaped/month.xpm -share/gnome/asclock/shaped/second.xpm -share/gnome/asclock/shaped/weekday.xpm +share/gnome/control-center/Desktop/gnome-panel-properties.desktop +share/gnome/control-center/Session/gnome-hint-properties.desktop share/gnome/default.session share/gnome/default.wm -share/gnome/help/gnome-intro/C/a-sample-session.html -share/gnome/help/gnome-intro/C/a-sample-session75.html -share/gnome/help/gnome-intro/C/c93.html -share/gnome/help/gnome-intro/C/c93127.html -share/gnome/help/gnome-intro/C/c93175.html -share/gnome/help/gnome-intro/C/c93191.html -share/gnome/help/gnome-intro/C/c93230.html -share/gnome/help/gnome-intro/C/c93302.html -share/gnome/help/gnome-intro/C/c93372.html -share/gnome/help/gnome-intro/C/c93412.html -share/gnome/help/gnome-intro/C/docbook.css -share/gnome/help/gnome-intro/C/f13.html -share/gnome/help/gnome-intro/C/f1346.html -share/gnome/help/gnome-intro/C/gnome-intro.html -share/gnome/help/gnome-intro/C/index.html -share/gnome/help/gnome-intro/C/pix/background-properties.gif -share/gnome/help/gnome-intro/C/pix/calendar.gif -share/gnome/help/gnome-intro/C/pix/ee-menu.gif -share/gnome/help/gnome-intro/C/pix/freecell.gif -share/gnome/help/gnome-intro/C/pix/gcalc.gif -share/gnome/help/gnome-intro/C/pix/gedit-2files.gif -share/gnome/help/gnome-intro/C/pix/ghex-2files.gif -share/gnome/help/gnome-intro/C/pix/ghex-basic.gif -share/gnome/help/gnome-intro/C/pix/gmc-basic.gif -share/gnome/help/gnome-intro/C/pix/gmix.gif -share/gnome/help/gnome-intro/C/pix/gnomine.gif -share/gnome/help/gnome-intro/C/pix/gtcd-cddb.gif -share/gnome/help/gnome-intro/C/pix/gtcd-track-list.gif -share/gnome/help/gnome-intro/C/pix/gtcd.gif -share/gnome/help/gnome-intro/C/pix/gtop-kill.gif -share/gnome/help/gnome-intro/C/pix/gtop-mem.gif -share/gnome/help/gnome-intro/C/pix/gtop-procs.gif -share/gnome/help/gnome-intro/C/pix/gtt-2proj.gif -share/gnome/help/gnome-intro/C/pix/gtt-basic.gif -share/gnome/help/gnome-intro/C/pix/gtt-new.gif -share/gnome/help/gnome-intro/C/pix/gulp.gif -share/gnome/help/gnome-intro/C/pix/help-browser-initial.gif -share/gnome/help/gnome-intro/C/pix/help-browser-sample.gif -share/gnome/help/gnome-intro/C/pix/help-icon.gif -share/gnome/help/gnome-intro/C/pix/mahjongg.gif -share/gnome/help/gnome-intro/C/pix/panel-add-icon.gif -share/gnome/help/gnome-intro/C/pix/panel-basic.gif -share/gnome/help/gnome-intro/C/pix/panel-icons.gif -share/gnome/help/gnome-intro/C/pix/panel-menu-select.gif -share/gnome/help/gnome-intro/C/pix/panel-menu.gif -share/gnome/help/gnome-intro/C/pix/same-gnome.gif -share/gnome/help/gnome-intro/C/pix/terminal.gif -share/gnome/help/gnome-intro/C/topic.dat +share/gnome/gnome-about/contributors.dat +share/gnome/help/clock_applet/C/clock_applet.png +share/gnome/help/clock_applet/C/clock_settings.png +share/gnome/help/clock_applet/C/docbook.css +share/gnome/help/clock_applet/C/index.html +share/gnome/help/clock_applet/C/ln7.html +share/gnome/help/clock_applet/C/stylesheet-images/caution.png +share/gnome/help/clock_applet/C/stylesheet-images/important.png +share/gnome/help/clock_applet/C/stylesheet-images/note.png +share/gnome/help/clock_applet/C/stylesheet-images/tip.png +share/gnome/help/clock_applet/C/stylesheet-images/warning.png +share/gnome/help/clock_applet/da/clock_applet.png +share/gnome/help/clock_applet/da/clock_settings.png +share/gnome/help/clock_applet/da/docbook.css +share/gnome/help/clock_applet/da/index.html +share/gnome/help/clock_applet/da/ln10.html +share/gnome/help/clock_applet/da/stylesheet-images/caution.png +share/gnome/help/clock_applet/da/stylesheet-images/important.png +share/gnome/help/clock_applet/da/stylesheet-images/note.png +share/gnome/help/clock_applet/da/stylesheet-images/tip.png +share/gnome/help/clock_applet/da/stylesheet-images/warning.png +share/gnome/help/desk-guide_applet/C/deskguide-fig.png +share/gnome/help/desk-guide_applet/C/deskguide-properties-advanced-fig.png +share/gnome/help/desk-guide_applet/C/deskguide-properties-geometry-fig.png +share/gnome/help/desk-guide_applet/C/deskguide-properties-tasks-fig.png +share/gnome/help/desk-guide_applet/C/deskguide-properties.png +share/gnome/help/desk-guide_applet/C/deskguide-tasklist-fig.png +share/gnome/help/desk-guide_applet/C/docbook.css +share/gnome/help/desk-guide_applet/C/index.html +share/gnome/help/desk-guide_applet/C/ln7.html +share/gnome/help/desk-guide_applet/C/stylesheet-images/caution.png +share/gnome/help/desk-guide_applet/C/stylesheet-images/important.png +share/gnome/help/desk-guide_applet/C/stylesheet-images/note.png +share/gnome/help/desk-guide_applet/C/stylesheet-images/tip.png +share/gnome/help/desk-guide_applet/C/stylesheet-images/warning.png +share/gnome/help/desk-guide_applet/de/deskguide-fig.png +share/gnome/help/desk-guide_applet/de/deskguide-properties-advanced-fig.png +share/gnome/help/desk-guide_applet/de/deskguide-properties-geometry-fig.png +share/gnome/help/desk-guide_applet/de/deskguide-properties-tasks-fig.png +share/gnome/help/desk-guide_applet/de/deskguide-properties.png +share/gnome/help/desk-guide_applet/de/deskguide-tasklist-fig.png +share/gnome/help/desk-guide_applet/de/docbook.css +share/gnome/help/desk-guide_applet/de/index.html +share/gnome/help/desk-guide_applet/de/ln11.html +share/gnome/help/desk-guide_applet/de/stylesheet-images/caution.png +share/gnome/help/desk-guide_applet/de/stylesheet-images/important.png +share/gnome/help/desk-guide_applet/de/stylesheet-images/note.png +share/gnome/help/desk-guide_applet/de/stylesheet-images/tip.png +share/gnome/help/desk-guide_applet/de/stylesheet-images/warning.png +share/gnome/help/fish_applet/C/docbook.css +share/gnome/help/fish_applet/C/fish_applet.png +share/gnome/help/fish_applet/C/fish_settings.png +share/gnome/help/fish_applet/C/index.html +share/gnome/help/fish_applet/C/ln7.html +share/gnome/help/fish_applet/C/stylesheet-images/caution.png +share/gnome/help/fish_applet/C/stylesheet-images/important.png +share/gnome/help/fish_applet/C/stylesheet-images/note.png +share/gnome/help/fish_applet/C/stylesheet-images/tip.png +share/gnome/help/fish_applet/C/stylesheet-images/warning.png +share/gnome/help/fish_applet/da/docbook.css +share/gnome/help/fish_applet/da/fish_applet.png +share/gnome/help/fish_applet/da/fish_settings.png +share/gnome/help/fish_applet/da/index.html +share/gnome/help/fish_applet/da/ln10.html +share/gnome/help/fish_applet/da/stylesheet-images/caution.png +share/gnome/help/fish_applet/da/stylesheet-images/important.png +share/gnome/help/fish_applet/da/stylesheet-images/note.png +share/gnome/help/fish_applet/da/stylesheet-images/tip.png +share/gnome/help/fish_applet/da/stylesheet-images/warning.png +share/gnome/help/fish_applet/no/docbook.css +share/gnome/help/fish_applet/no/index.html +share/gnome/help/fish_applet/no/ln7.html +share/gnome/help/fish_applet/no/stylesheet-images/caution.png +share/gnome/help/fish_applet/no/stylesheet-images/important.png +share/gnome/help/fish_applet/no/stylesheet-images/note.png +share/gnome/help/fish_applet/no/stylesheet-images/tip.png +share/gnome/help/fish_applet/no/stylesheet-images/warning.png +share/gnome/help/gen_util_applet/de/docbook.css +share/gnome/help/gen_util_applet/de/index.html +share/gnome/help/gen_util_applet/de/ln7.html +share/gnome/help/gen_util_applet/de/stylesheet-images/caution.png +share/gnome/help/gen_util_applet/de/stylesheet-images/important.png +share/gnome/help/gen_util_applet/de/stylesheet-images/note.png +share/gnome/help/gen_util_applet/de/stylesheet-images/tip.png +share/gnome/help/gen_util_applet/de/stylesheet-images/warning.png +share/gnome/help/gen_util_applet/no/docbook.css +share/gnome/help/gen_util_applet/no/index.html +share/gnome/help/gen_util_applet/no/ln7.html +share/gnome/help/gen_util_applet/no/stylesheet-images/caution.png +share/gnome/help/gen_util_applet/no/stylesheet-images/important.png +share/gnome/help/gen_util_applet/no/stylesheet-images/note.png +share/gnome/help/gen_util_applet/no/stylesheet-images/tip.png +share/gnome/help/gen_util_applet/no/stylesheet-images/warning.png share/gnome/help/gnome-terminal/C/authors.html share/gnome/help/gnome-terminal/C/classes.html share/gnome/help/gnome-terminal/C/config.html share/gnome/help/gnome-terminal/C/docbook.css -share/gnome/help/gnome-terminal/C/emulation.html share/gnome/help/gnome-terminal/C/environment.html share/gnome/help/gnome-terminal/C/index.html -share/gnome/help/gnome-terminal/C/ln12.html +share/gnome/help/gnome-terminal/C/license.html +share/gnome/help/gnome-terminal/C/ln11.html share/gnome/help/gnome-terminal/C/menus.html share/gnome/help/gnome-terminal/C/options.html share/gnome/help/gnome-terminal/C/pointerusage.html -share/gnome/help/gnome-terminal/C/terminal.html +share/gnome/help/gnome-terminal/C/stylesheet-images/caution.png +share/gnome/help/gnome-terminal/C/stylesheet-images/important.png +share/gnome/help/gnome-terminal/C/stylesheet-images/note.png +share/gnome/help/gnome-terminal/C/stylesheet-images/tip.png +share/gnome/help/gnome-terminal/C/stylesheet-images/warning.png share/gnome/help/gnome-terminal/C/topic.dat +share/gnome/help/gnome-terminal/C/usage.html share/gnome/help/gnome-terminal/da/authors.html share/gnome/help/gnome-terminal/da/classes.html share/gnome/help/gnome-terminal/da/config.html @@ -279,22 +224,61 @@ share/gnome/help/gnome-terminal/da/ln9.html share/gnome/help/gnome-terminal/da/menus.html share/gnome/help/gnome-terminal/da/options.html share/gnome/help/gnome-terminal/da/pointerusage.html +share/gnome/help/gnome-terminal/da/stylesheet-images/caution.png +share/gnome/help/gnome-terminal/da/stylesheet-images/important.png +share/gnome/help/gnome-terminal/da/stylesheet-images/note.png +share/gnome/help/gnome-terminal/da/stylesheet-images/tip.png +share/gnome/help/gnome-terminal/da/stylesheet-images/warning.png share/gnome/help/gnome-terminal/da/terminal.html share/gnome/help/gnome-terminal/da/termtech.html share/gnome/help/gnome-terminal/da/topic.dat +share/gnome/help/gnome-terminal/de/authors.html +share/gnome/help/gnome-terminal/de/classes.html +share/gnome/help/gnome-terminal/de/config.html +share/gnome/help/gnome-terminal/de/docbook.css +share/gnome/help/gnome-terminal/de/environment.html +share/gnome/help/gnome-terminal/de/index.html +share/gnome/help/gnome-terminal/de/ln11.html +share/gnome/help/gnome-terminal/de/menus.html +share/gnome/help/gnome-terminal/de/options.html +share/gnome/help/gnome-terminal/de/pointerusage.html +share/gnome/help/gnome-terminal/de/topic.dat +share/gnome/help/gnome-terminal/de/usage.html share/gnome/help/gnome-terminal/es/authors.html share/gnome/help/gnome-terminal/es/classes.html share/gnome/help/gnome-terminal/es/config.html share/gnome/help/gnome-terminal/es/docbook.css -share/gnome/help/gnome-terminal/es/emulation.html share/gnome/help/gnome-terminal/es/environment.html share/gnome/help/gnome-terminal/es/index.html -share/gnome/help/gnome-terminal/es/ln15.html +share/gnome/help/gnome-terminal/es/ln17.html share/gnome/help/gnome-terminal/es/menus.html share/gnome/help/gnome-terminal/es/options.html share/gnome/help/gnome-terminal/es/pointerusage.html -share/gnome/help/gnome-terminal/es/terminal.html +share/gnome/help/gnome-terminal/es/stylesheet-images/caution.png +share/gnome/help/gnome-terminal/es/stylesheet-images/important.png +share/gnome/help/gnome-terminal/es/stylesheet-images/note.png +share/gnome/help/gnome-terminal/es/stylesheet-images/tip.png +share/gnome/help/gnome-terminal/es/stylesheet-images/warning.png share/gnome/help/gnome-terminal/es/topic.dat +share/gnome/help/gnome-terminal/es/usage.html +share/gnome/help/gnome-terminal/it/authors.html +share/gnome/help/gnome-terminal/it/classes.html +share/gnome/help/gnome-terminal/it/config.html +share/gnome/help/gnome-terminal/it/docbook.css +share/gnome/help/gnome-terminal/it/emulation.html +share/gnome/help/gnome-terminal/it/environment.html +share/gnome/help/gnome-terminal/it/index.html +share/gnome/help/gnome-terminal/it/ln12.html +share/gnome/help/gnome-terminal/it/menus.html +share/gnome/help/gnome-terminal/it/options.html +share/gnome/help/gnome-terminal/it/pointerusage.html +share/gnome/help/gnome-terminal/it/stylesheet-images/caution.png +share/gnome/help/gnome-terminal/it/stylesheet-images/important.png +share/gnome/help/gnome-terminal/it/stylesheet-images/note.png +share/gnome/help/gnome-terminal/it/stylesheet-images/tip.png +share/gnome/help/gnome-terminal/it/stylesheet-images/warning.png +share/gnome/help/gnome-terminal/it/terminal.html +share/gnome/help/gnome-terminal/it/topic.dat share/gnome/help/gnome-terminal/no/authors.html share/gnome/help/gnome-terminal/no/classes.html share/gnome/help/gnome-terminal/no/config.html @@ -306,6 +290,11 @@ share/gnome/help/gnome-terminal/no/ln9.html share/gnome/help/gnome-terminal/no/menus.html share/gnome/help/gnome-terminal/no/options.html share/gnome/help/gnome-terminal/no/pointerusage.html +share/gnome/help/gnome-terminal/no/stylesheet-images/caution.png +share/gnome/help/gnome-terminal/no/stylesheet-images/important.png +share/gnome/help/gnome-terminal/no/stylesheet-images/note.png +share/gnome/help/gnome-terminal/no/stylesheet-images/tip.png +share/gnome/help/gnome-terminal/no/stylesheet-images/warning.png share/gnome/help/gnome-terminal/no/terminal.html share/gnome/help/gnome-terminal/no/termtech.html share/gnome/help/gnome-terminal/no/topic.dat @@ -330,8 +319,11 @@ share/gnome/help/help-browser/fr/default-page.html share/gnome/help/help-browser/fr/help-browser.html share/gnome/help/help-browser/fr/index.html share/gnome/help/help-browser/fr/topic.dat +share/gnome/help/help-browser/gl/default-page.html +share/gnome/help/help-browser/gl/help-browser.html +share/gnome/help/help-browser/gl/index.html +share/gnome/help/help-browser/gl/topic.dat share/gnome/help/help-browser/hu/default-page.html -share/gnome/help/help-browser/hu/gnome-logo-large.png share/gnome/help/help-browser/hu/help-browser.html share/gnome/help/help-browser/hu/index.html share/gnome/help/help-browser/hu/topic.dat @@ -347,81 +339,275 @@ share/gnome/help/help-browser/ko/default-page.html share/gnome/help/help-browser/ko/help-browser.html share/gnome/help/help-browser/ko/index.html share/gnome/help/help-browser/ko/topic.dat +share/gnome/help/help-browser/lt/default-page.html +share/gnome/help/help-browser/lt/help-browser.html +share/gnome/help/help-browser/lt/index.html +share/gnome/help/help-browser/lt/topic.dat share/gnome/help/help-browser/no/default-page.html share/gnome/help/help-browser/no/help-browser.html share/gnome/help/help-browser/no/index.html share/gnome/help/help-browser/no/topic.dat +share/gnome/help/help-browser/uk/default-page.html +share/gnome/help/help-browser/uk/help-browser.html +share/gnome/help/help-browser/uk/index.html +share/gnome/help/help-browser/uk/topic.dat share/gnome/help/help-browser/wa/default-page.html share/gnome/help/help-browser/wa/help-browser.html share/gnome/help/help-browser/wa/index.html share/gnome/help/help-browser/wa/topic.dat -share/gnome/help/mini-commander_applet/C/change-log.html -share/gnome/help/mini-commander_applet/C/clock.html -share/gnome/help/mini-commander_applet/C/command-completion.html -share/gnome/help/mini-commander_applet/C/command-history.html -share/gnome/help/mini-commander_applet/C/download.html -share/gnome/help/mini-commander_applet/C/faq.html -share/gnome/help/mini-commander_applet/C/features.html -share/gnome/help/mini-commander_applet/C/feedback.html -share/gnome/help/mini-commander_applet/C/gpl2.html -share/gnome/help/mini-commander_applet/C/history.html -share/gnome/help/mini-commander_applet/C/index.html -share/gnome/help/mini-commander_applet/C/introduction.html -share/gnome/help/mini-commander_applet/C/legal-notice.html -share/gnome/help/mini-commander_applet/C/macros.html -share/gnome/help/mini-commander_applet/C/properties-0.html -share/gnome/help/mini-commander_applet/C/screenshots.html -share/gnome/help/mini-commander_applet/C/topic.dat -share/gnome/help/mini-commander_applet/C/todo.html +share/gnome/help/mailcheck_applet/C/docbook.css +share/gnome/help/mailcheck_applet/C/index.html +share/gnome/help/mailcheck_applet/C/ln7.html +share/gnome/help/mailcheck_applet/C/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck_applet/C/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck_applet/C/stylesheet-images/caution.png +share/gnome/help/mailcheck_applet/C/stylesheet-images/important.png +share/gnome/help/mailcheck_applet/C/stylesheet-images/note.png +share/gnome/help/mailcheck_applet/C/stylesheet-images/tip.png +share/gnome/help/mailcheck_applet/C/stylesheet-images/warning.png +share/gnome/help/mailcheck_applet/da/docbook.css +share/gnome/help/mailcheck_applet/da/index.html +share/gnome/help/mailcheck_applet/da/ln7.html +share/gnome/help/mailcheck_applet/da/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck_applet/da/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck_applet/da/stylesheet-images/caution.png +share/gnome/help/mailcheck_applet/da/stylesheet-images/important.png +share/gnome/help/mailcheck_applet/da/stylesheet-images/note.png +share/gnome/help/mailcheck_applet/da/stylesheet-images/tip.png +share/gnome/help/mailcheck_applet/da/stylesheet-images/warning.png +share/gnome/help/panel/C/appletadd.html +share/gnome/help/panel/C/applets.html +share/gnome/help/panel/C/authors.html +share/gnome/help/panel/C/docbook.css +share/gnome/help/panel/C/drawers.html +share/gnome/help/panel/C/figures/create_launcher.png +share/gnome/help/panel/C/figures/drawer_open.png +share/gnome/help/panel/C/figures/drawer_properties.png +share/gnome/help/panel/C/figures/example_menu.png +share/gnome/help/panel/C/figures/example_panel.png +share/gnome/help/panel/C/figures/glob_pref_anim.png +share/gnome/help/panel/C/figures/hide-button.png +share/gnome/help/panel/C/figures/launcher_advprops.png +share/gnome/help/panel/C/figures/launcher_properties_advanced.png +share/gnome/help/panel/C/figures/launcher_properties_basic.png +share/gnome/help/panel/C/figures/launcher_props.png +share/gnome/help/panel/C/figures/logout-screen.png +share/gnome/help/panel/C/figures/mainmenu_properties.png +share/gnome/help/panel/C/figures/menu_properties.png +share/gnome/help/panel/C/figures/mm-button.png +share/gnome/help/panel/C/figures/panel_applets.png +share/gnome/help/panel/C/figures/panel_lockbut.png +share/gnome/help/panel/C/figures/panel_logoutbut.png +share/gnome/help/panel/C/figures/panel_props_back.png +share/gnome/help/panel/C/figures/panel_props_edge.png +share/gnome/help/panel/C/figures/panel_runbutton.png +share/gnome/help/panel/C/figures/panel_runprogram.png +share/gnome/help/panel/C/figures/panel_swallow.png +share/gnome/help/panel/C/figures/status_dock.png +share/gnome/help/panel/C/globalpanelprefs.html +share/gnome/help/panel/C/index.html +share/gnome/help/panel/C/launchers.html +share/gnome/help/panel/C/license.html +share/gnome/help/panel/C/ln7.html +share/gnome/help/panel/C/mainmenu.html +share/gnome/help/panel/C/menus.html +share/gnome/help/panel/C/panelbasics.html +share/gnome/help/panel/C/panelbugs.html +share/gnome/help/panel/C/panelmove.html +share/gnome/help/panel/C/panelproperties.html +share/gnome/help/panel/C/specialobjects.html +share/gnome/help/panel/C/stylesheet-images/caution.png +share/gnome/help/panel/C/stylesheet-images/important.png +share/gnome/help/panel/C/stylesheet-images/note.png +share/gnome/help/panel/C/stylesheet-images/tip.png +share/gnome/help/panel/C/stylesheet-images/warning.png +share/gnome/help/panel/C/topic.dat +share/gnome/help/panel/de/appletadd.html +share/gnome/help/panel/de/applets.html +share/gnome/help/panel/de/authors.html +share/gnome/help/panel/de/docbook.css +share/gnome/help/panel/de/drawers.html +share/gnome/help/panel/de/figures/create_launcher.png +share/gnome/help/panel/de/figures/drawer_open.png +share/gnome/help/panel/de/figures/drawer_properties.png +share/gnome/help/panel/de/figures/example_menu.png +share/gnome/help/panel/de/figures/example_panel.png +share/gnome/help/panel/de/figures/glob_pref_anim.png +share/gnome/help/panel/de/figures/hide-button.png +share/gnome/help/panel/de/figures/launcher_advprops.png +share/gnome/help/panel/de/figures/launcher_properties_advanced.png +share/gnome/help/panel/de/figures/launcher_properties_basic.png +share/gnome/help/panel/de/figures/launcher_props.png +share/gnome/help/panel/de/figures/logout-screen.png +share/gnome/help/panel/de/figures/mainmenu_properties.png +share/gnome/help/panel/de/figures/menu_properties.png +share/gnome/help/panel/de/figures/mm-button.png +share/gnome/help/panel/de/figures/panel_applets.png +share/gnome/help/panel/de/figures/panel_lockbut.png +share/gnome/help/panel/de/figures/panel_logoutbut.png +share/gnome/help/panel/de/figures/panel_props_back.png +share/gnome/help/panel/de/figures/panel_props_edge.png +share/gnome/help/panel/de/figures/panel_swallow.png +share/gnome/help/panel/de/figures/status_dock.png +share/gnome/help/panel/de/globalpanelprefs.html +share/gnome/help/panel/de/index.html +share/gnome/help/panel/de/launchers.html +share/gnome/help/panel/de/ln7.html +share/gnome/help/panel/de/mainmenu.html +share/gnome/help/panel/de/menus.html +share/gnome/help/panel/de/panelbasics.html +share/gnome/help/panel/de/panelbugs.html +share/gnome/help/panel/de/panelmove.html +share/gnome/help/panel/de/panelproperties.html +share/gnome/help/panel/de/specialobjects.html +share/gnome/help/panel/de/stylesheet-images/caution.png +share/gnome/help/panel/de/stylesheet-images/important.png +share/gnome/help/panel/de/stylesheet-images/note.png +share/gnome/help/panel/de/stylesheet-images/tip.png +share/gnome/help/panel/de/stylesheet-images/warning.png +share/gnome/help/panel/de/topic.dat +share/gnome/help/panel/it/appletadd.html +share/gnome/help/panel/it/applets.html +share/gnome/help/panel/it/authors.html +share/gnome/help/panel/it/docbook.css +share/gnome/help/panel/it/drawers.html +share/gnome/help/panel/it/figures/create_launcher.png +share/gnome/help/panel/it/figures/drawer_open.png +share/gnome/help/panel/it/figures/drawer_properties.png +share/gnome/help/panel/it/figures/example_menu.png +share/gnome/help/panel/it/figures/example_panel.png +share/gnome/help/panel/it/figures/glob_pref_anim.png +share/gnome/help/panel/it/figures/hide-button.png +share/gnome/help/panel/it/figures/launcher_advprops.png +share/gnome/help/panel/it/figures/launcher_properties_advanced.png +share/gnome/help/panel/it/figures/launcher_properties_basic.png +share/gnome/help/panel/it/figures/launcher_props.png +share/gnome/help/panel/it/figures/mainmenu_properties.png +share/gnome/help/panel/it/figures/menu_properties.png +share/gnome/help/panel/it/figures/mm-button.png +share/gnome/help/panel/it/figures/panel_applets.png +share/gnome/help/panel/it/figures/panel_lockbut.png +share/gnome/help/panel/it/figures/panel_logoutbut.png +share/gnome/help/panel/it/figures/panel_props_back.png +share/gnome/help/panel/it/figures/panel_props_edge.png +share/gnome/help/panel/it/figures/panel_runbutton.png +share/gnome/help/panel/it/figures/panel_runprogram.png +share/gnome/help/panel/it/figures/panel_swallow.png +share/gnome/help/panel/it/figures/status_dock.png +share/gnome/help/panel/it/globalpanelprefs.html +share/gnome/help/panel/it/index.html +share/gnome/help/panel/it/launchers.html +share/gnome/help/panel/it/ln7.html +share/gnome/help/panel/it/mainmenu.html +share/gnome/help/panel/it/menus.html +share/gnome/help/panel/it/panelbasics.html +share/gnome/help/panel/it/panelbugs.html +share/gnome/help/panel/it/panelmove.html +share/gnome/help/panel/it/panelproperties.html +share/gnome/help/panel/it/specialobjects.html +share/gnome/help/panel/it/stylesheet-images/caution.png +share/gnome/help/panel/it/stylesheet-images/important.png +share/gnome/help/panel/it/stylesheet-images/note.png +share/gnome/help/panel/it/stylesheet-images/tip.png +share/gnome/help/panel/it/stylesheet-images/warning.png +share/gnome/help/panel/it/topic.dat +share/gnome/help/printer_applet/C/docbook.css +share/gnome/help/printer_applet/C/index.html +share/gnome/help/printer_applet/C/ln7.html +share/gnome/help/printer_applet/C/printer-fig.png +share/gnome/help/printer_applet/C/printer-properties.png +share/gnome/help/printer_applet/C/stylesheet-images/caution.png +share/gnome/help/printer_applet/C/stylesheet-images/important.png +share/gnome/help/printer_applet/C/stylesheet-images/note.png +share/gnome/help/printer_applet/C/stylesheet-images/tip.png +share/gnome/help/printer_applet/C/stylesheet-images/warning.png +share/gnome/help/printer_applet/da/docbook.css +share/gnome/help/printer_applet/da/index.html +share/gnome/help/printer_applet/da/ln10.html +share/gnome/help/printer_applet/da/printer-fig.png +share/gnome/help/printer_applet/da/printer-properties.png +share/gnome/help/printer_applet/da/stylesheet-images/caution.png +share/gnome/help/printer_applet/da/stylesheet-images/important.png +share/gnome/help/printer_applet/da/stylesheet-images/note.png +share/gnome/help/printer_applet/da/stylesheet-images/tip.png +share/gnome/help/printer_applet/da/stylesheet-images/warning.png +share/gnome/help/session/C/authors.html +share/gnome/help/session/C/bugs.html +share/gnome/help/session/C/button_remove.png +share/gnome/help/session/C/docbook.css +share/gnome/help/session/C/index.html +share/gnome/help/session/C/license.html +share/gnome/help/session/C/ln7.html +share/gnome/help/session/C/session-properties.png +share/gnome/help/session/C/stock_exec.png +share/gnome/help/session/C/stock_help.png +share/gnome/help/session/C/stock_preferences.png +share/gnome/help/session/C/stock_refresh.png +share/gnome/help/session/C/stock_save.png +share/gnome/help/session/C/stock_timer.png +share/gnome/help/session/C/stock_trash.png +share/gnome/help/session/C/stylesheet-images/caution.png +share/gnome/help/session/C/stylesheet-images/important.png +share/gnome/help/session/C/stylesheet-images/note.png +share/gnome/help/session/C/stylesheet-images/tip.png +share/gnome/help/session/C/stylesheet-images/warning.png +share/gnome/help/tasklist_applet/C/docbook.css +share/gnome/help/tasklist_applet/C/index.html +share/gnome/help/tasklist_applet/C/ln7.html +share/gnome/help/tasklist_applet/C/stylesheet-images/caution.png +share/gnome/help/tasklist_applet/C/stylesheet-images/important.png +share/gnome/help/tasklist_applet/C/stylesheet-images/note.png +share/gnome/help/tasklist_applet/C/stylesheet-images/tip.png +share/gnome/help/tasklist_applet/C/stylesheet-images/warning.png +share/gnome/help/tasklist_applet/C/tasklist-fig.png +share/gnome/help/tasklist_applet/C/tasklist-properties-size.png +share/gnome/help/tasklist_applet/C/tasklist-properties.png +share/gnome/help/tasklist_applet/C/tasklist-rightclick-fig.png +share/gnome/hints/panel.hints +share/gnome/html/panel-decl.txt +share/gnome/html/panel-sections.txt +share/gnome/html/panel.hierarchy +share/gnome/html/panel.html +share/gnome/html/panel.sgml +share/gnome/html/panel.signals +share/gnome/html/panel.types +share/gnome/html/panel/appletwidget.html +share/gnome/html/panel/book1.html +share/gnome/html/panel/c26.html +share/gnome/html/panel/panel-context-menu.html +share/gnome/html/panel/panel-miscellaneous.html +share/gnome/html/panel/panel-panel-interaction.html +share/gnome/html/panel/r1373.html +share/gnome/html/panel/r160.html +share/gnome/html/panel/statusdocklet.html +share/gnome/html/panel/x101.html +share/gnome/html/panel/x126.html +share/gnome/html/panel/x134.html +share/gnome/html/panel/x149.html +share/gnome/html/panel/x156.html +share/gnome/html/panel/x31.html +share/gnome/html/panel/x38.html +share/gnome/html/panel/x49.html +share/gnome/html/panel/x57.html +share/gnome/html/panel/x76.html +share/gnome/html/panel/x95.html +share/gnome/idl/Terminal.idl share/gnome/idl/gnome-panel.idl share/gnome/idl/help-browser.idl share/gnome/mc/templates/GIMP.desktop share/gnome/panelrc -share/gnome/pixmaps/another_clock.xpm share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png -share/gnome/pixmaps/charpick.png -share/gnome/pixmaps/emacs.png share/gnome/pixmaps/fish/fishanim.png +share/gnome/pixmaps/fish/footguy.png +share/gnome/pixmaps/fish/monkey.png share/gnome/pixmaps/fish/oldwanda.png -share/gnome/pixmaps/gkb.xpm -share/gnome/pixmaps/gkb/at.xpm -share/gnome/pixmaps/gkb/be.xpm -share/gnome/pixmaps/gkb/bg.xpm -share/gnome/pixmaps/gkb/ca.xpm -share/gnome/pixmaps/gkb/ch.xpm -share/gnome/pixmaps/gkb/cz.xpm -share/gnome/pixmaps/gkb/de.xpm -share/gnome/pixmaps/gkb/dk.xpm -share/gnome/pixmaps/gkb/ee.xpm -share/gnome/pixmaps/gkb/es.xpm -share/gnome/pixmaps/gkb/fi.xpm -share/gnome/pixmaps/gkb/fr.xpm -share/gnome/pixmaps/gkb/gb.xpm -share/gnome/pixmaps/gkb/gr.xpm -share/gnome/pixmaps/gkb/hu.xpm -share/gnome/pixmaps/gkb/il.xpm -share/gnome/pixmaps/gkb/is.xpm -share/gnome/pixmaps/gkb/it.xpm -share/gnome/pixmaps/gkb/jp.xpm -share/gnome/pixmaps/gkb/nl.xpm -share/gnome/pixmaps/gkb/no.xpm -share/gnome/pixmaps/gkb/pl.xpm -share/gnome/pixmaps/gkb/pt.xpm -share/gnome/pixmaps/gkb/qc.xpm -share/gnome/pixmaps/gkb/ru.xpm -share/gnome/pixmaps/gkb/se.xpm -share/gnome/pixmaps/gkb/si.xpm -share/gnome/pixmaps/gkb/sk.xpm -share/gnome/pixmaps/gkb/th.xpm -share/gnome/pixmaps/gkb/tr.xpm -share/gnome/pixmaps/gkb/us.xpm -share/gnome/pixmaps/gkb/yu.xpm +share/gnome/pixmaps/gnome-amusements.png share/gnome/pixmaps/gnome-aorta.png +share/gnome/pixmaps/gnome-applets.png +share/gnome/pixmaps/gnome-applications.png share/gnome/pixmaps/gnome-audio2.png share/gnome/pixmaps/gnome-background.png -share/gnome/pixmaps/gnome-balsa2.png -share/gnome/pixmaps/gnome-battery.png share/gnome/pixmaps/gnome-calc2.png share/gnome/pixmaps/gnome-calendar.png share/gnome/pixmaps/gnome-cardgame.png @@ -438,27 +624,29 @@ share/gnome/pixmaps/gnome-ccwindowmanager.png share/gnome/pixmaps/gnome-clock.png share/gnome/pixmaps/gnome-color-browser.png share/gnome/pixmaps/gnome-color-xterm.png -share/gnome/pixmaps/gnome-cpu-mem.png -share/gnome/pixmaps/gnome-cpu.png +share/gnome/pixmaps/gnome-computer.png share/gnome/pixmaps/gnome-cromagnon.png -share/gnome/pixmaps/gnome-default.png +share/gnome/pixmaps/gnome-debian.png share/gnome/pixmaps/gnome-deskguide-splash.png share/gnome/pixmaps/gnome-deskguide.png +share/gnome/pixmaps/gnome-devel.png share/gnome/pixmaps/gnome-die1.png share/gnome/pixmaps/gnome-die2.png share/gnome/pixmaps/gnome-die3.png share/gnome/pixmaps/gnome-die4.png share/gnome/pixmaps/gnome-die5.png share/gnome/pixmaps/gnome-die6.png -share/gnome/pixmaps/gnome-ee.png +share/gnome/pixmaps/gnome-diskfree.png +share/gnome/pixmaps/gnome-emacs.png share/gnome/pixmaps/gnome-eterm.png share/gnome/pixmaps/gnome-favorites.png -share/gnome/pixmaps/gnome-fifteen.png share/gnome/pixmaps/gnome-file-c.png share/gnome/pixmaps/gnome-file-h.png share/gnome/pixmaps/gnome-fish.png share/gnome/pixmaps/gnome-folder.png share/gnome/pixmaps/gnome-gegl.png +share/gnome/pixmaps/gnome-gegl2-2.png +share/gnome/pixmaps/gnome-gegl2.png share/gnome/pixmaps/gnome-gemvt.png share/gnome/pixmaps/gnome-gimp.png share/gnome/pixmaps/gnome-globe.png @@ -468,27 +656,37 @@ share/gnome/pixmaps/gnome-gnomine.png share/gnome/pixmaps/gnome-graphics.png share/gnome/pixmaps/gnome-gsame.png share/gnome/pixmaps/gnome-help.png +share/gnome/pixmaps/gnome-hint.png share/gnome/pixmaps/gnome-html.png share/gnome/pixmaps/gnome-image-gif.png share/gnome/pixmaps/gnome-image-jpeg.png share/gnome/pixmaps/gnome-irc.png share/gnome/pixmaps/gnome-joystick.png share/gnome/pixmaps/gnome-laptop.png -share/gnome/pixmaps/gnome-life.png share/gnome/pixmaps/gnome-lockscreen.png share/gnome/pixmaps/gnome-log.png share/gnome/pixmaps/gnome-logo-icon-transparent.png share/gnome/pixmaps/gnome-logo-icon.png share/gnome/pixmaps/gnome-logo-large.png -share/gnome/pixmaps/gnome-mem.png +share/gnome/pixmaps/gnome-mailcheck.png +share/gnome/pixmaps/gnome-mdi.png share/gnome/pixmaps/gnome-mnemonic.png share/gnome/pixmaps/gnome-modem.png share/gnome/pixmaps/gnome-money.png +share/gnome/pixmaps/gnome-monitor.png share/gnome/pixmaps/gnome-mouse.png +share/gnome/pixmaps/gnome-multimedia.png share/gnome/pixmaps/gnome-networktool.png +share/gnome/pixmaps/gnome-news.png share/gnome/pixmaps/gnome-note.png share/gnome/pixmaps/gnome-panel.png share/gnome/pixmaps/gnome-qeye.png +share/gnome/pixmaps/gnome-run.png +share/gnome/pixmaps/gnome-session.png +share/gnome/pixmaps/gnome-settings.png +share/gnome/pixmaps/gnome-spider.png +share/gnome/pixmaps/gnome-squeak.png +share/gnome/pixmaps/gnome-suse.png share/gnome/pixmaps/gnome-talk.png share/gnome/pixmaps/gnome-tasklist.png share/gnome/pixmaps/gnome-term-linux.png @@ -498,18 +696,20 @@ share/gnome/pixmaps/gnome-term-tiger.png share/gnome/pixmaps/gnome-term.png share/gnome/pixmaps/gnome-terminal.png share/gnome/pixmaps/gnome-tigert.png +share/gnome/pixmaps/gnome-touristinfo.png share/gnome/pixmaps/gnome-unknown.png +share/gnome/pixmaps/gnome-user-interface.png share/gnome/pixmaps/gnome-util.png share/gnome/pixmaps/gnome-word.png share/gnome/pixmaps/gnome-xterm.png +share/gnome/pixmaps/gtkvim.png share/gnome/pixmaps/kterm.xpm share/gnome/pixmaps/launcher-program.png -share/gnome/pixmaps/mailcheck/email-eclouds.png share/gnome/pixmaps/mailcheck/email-e.png +share/gnome/pixmaps/mailcheck/email-eclouds.png +share/gnome/pixmaps/mailcheck/email-tiny.png share/gnome/pixmaps/mailcheck/email.png share/gnome/pixmaps/mailcheck/tux-anim.png -share/gnome/pixmaps/mini-commander/browser-mini.xpm -share/gnome/pixmaps/mini-commander/history-mini.xpm share/gnome/pixmaps/monitor.png share/gnome/pixmaps/netscape.png share/gnome/pixmaps/panel-arrow-down.png @@ -520,6 +720,7 @@ share/gnome/pixmaps/panel-drawer.png share/gnome/pixmaps/panel-folder.png share/gnome/pixmaps/panel-knob.png share/gnome/pixmaps/panel-menu-main.png +share/gnome/pixmaps/splash/gnome-splash.png share/gnome/pixmaps/tiles/tile-blue-down.png share/gnome/pixmaps/tiles/tile-blue-up.png share/gnome/pixmaps/tiles/tile-coral-down.png @@ -541,45 +742,7 @@ share/gnome/pixmaps/tiles/tile-purple-up.png share/gnome/pixmaps/tiles/tile-sand-down.png share/gnome/pixmaps/tiles/tile-sand-up.png share/gnome/pixmaps/vnterm.xpm -share/gnome/xmodmap/xmodmap.be -share/gnome/xmodmap/xmodmap.bg -share/gnome/xmodmap/xmodmap.ch -share/gnome/xmodmap/xmodmap.cz -share/gnome/xmodmap/xmodmap.de -share/gnome/xmodmap/xmodmap.dk -share/gnome/xmodmap/xmodmap.dvorak -share/gnome/xmodmap/xmodmap.ee -share/gnome/xmodmap/xmodmap.es -share/gnome/xmodmap/xmodmap.fi -share/gnome/xmodmap/xmodmap.fr -share/gnome/xmodmap/xmodmap.fr-2 -share/gnome/xmodmap/xmodmap.gr -share/gnome/xmodmap/xmodmap.hu -share/gnome/xmodmap/xmodmap.hu.old -share/gnome/xmodmap/xmodmap.il -share/gnome/xmodmap/xmodmap.is -share/gnome/xmodmap/xmodmap.it -share/gnome/xmodmap/xmodmap.la -share/gnome/xmodmap/xmodmap.nl -share/gnome/xmodmap/xmodmap.no -share/gnome/xmodmap/xmodmap.pl -share/gnome/xmodmap/xmodmap.pt -share/gnome/xmodmap/xmodmap.pt-dead -share/gnome/xmodmap/xmodmap.qc -share/gnome/xmodmap/xmodmap.ru -share/gnome/xmodmap/xmodmap.ru_koi8 -share/gnome/xmodmap/xmodmap.se -share/gnome/xmodmap/xmodmap.sf -share/gnome/xmodmap/xmodmap.sg -share/gnome/xmodmap/xmodmap.si -share/gnome/xmodmap/xmodmap.sk -share/gnome/xmodmap/xmodmap.th -share/gnome/xmodmap/xmodmap.tr_f -share/gnome/xmodmap/xmodmap.tr_q -share/gnome/xmodmap/xmodmap.uk -share/gnome/xmodmap/xmodmap.us -share/gnome/xmodmap/xmodmap.us.old -share/gnome/xmodmap/xmodmap.yu +share/locale/bg_BG.cp1251/LC_MESSAGES/gnome-core.mo share/locale/ca/LC_MESSAGES/gnome-core.mo share/locale/cs/LC_MESSAGES/gnome-core.mo share/locale/da/LC_MESSAGES/gnome-core.mo @@ -597,74 +760,125 @@ share/locale/hu/LC_MESSAGES/gnome-core.mo share/locale/it/LC_MESSAGES/gnome-core.mo share/locale/ja/LC_MESSAGES/gnome-core.mo share/locale/ko/LC_MESSAGES/gnome-core.mo +share/locale/lt/LC_MESSAGES/gnome-core.mo share/locale/nl/LC_MESSAGES/gnome-core.mo share/locale/no/LC_MESSAGES/gnome-core.mo share/locale/pl/LC_MESSAGES/gnome-core.mo share/locale/pt/LC_MESSAGES/gnome-core.mo share/locale/pt_BR/LC_MESSAGES/gnome-core.mo -share/locale/ro/LC_MESSAGES/gnome-core.mo share/locale/ru/LC_MESSAGES/gnome-core.mo share/locale/sk/LC_MESSAGES/gnome-core.mo share/locale/sv/LC_MESSAGES/gnome-core.mo +share/locale/tr/LC_MESSAGES/gnome-core.mo +share/locale/uk/LC_MESSAGES/gnome-core.mo share/locale/wa/LC_MESSAGES/gnome-core.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-core.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnome-core.mo -@dirrm etc/CORBA/servers -@dirrm etc/CORBA -@dirrm share/gnome/applets/Amusements -@dirrm share/gnome/applets/Clocks -@dirrm share/gnome/applets/Monitors -@dirrm share/gnome/applets/Multimedia -@dirrm share/gnome/applets/Network -@dirrm share/gnome/applets/Utility -@dirrm share/gnome/applets -@dirrm share/gnome/apps/Applications -@dirrm share/gnome/apps/Games -@dirrm share/gnome/apps/Graphics -@dirrm share/gnome/apps/Internet -@dirrm share/gnome/apps/Multimedia -@dirrm share/gnome/apps/Settings -@dirrm share/gnome/apps/System -@dirrm share/gnome/apps/Utilities -@dirrm share/gnome/apps -@dirrm share/gnome/asclock/Freeamp -@dirrm share/gnome/asclock/Newstone -@dirrm share/gnome/asclock/Orb -@dirrm share/gnome/asclock/Stone -@dirrm share/gnome/asclock/beats -@dirrm share/gnome/asclock/classic -@dirrm share/gnome/asclock/shaped -@dirrm share/gnome/asclock -@dirrm share/gnome/help/gnome-terminal/C -@dirrm share/gnome/help/gnome-terminal/da -@dirrm share/gnome/help/gnome-terminal/es -@dirrm share/gnome/help/gnome-terminal/no -@dirrm share/gnome/help/gnome-terminal -@dirrm share/gnome/help/gnome-intro/C/pix -@dirrm share/gnome/help/gnome-intro/C -@dirrm share/gnome/help/gnome-intro -@dirrm share/gnome/help/help-browser/C -@dirrm share/gnome/help/help-browser/ca -@dirrm share/gnome/help/help-browser/da -@dirrm share/gnome/help/help-browser/el -@dirrm share/gnome/help/help-browser/es -@dirrm share/gnome/help/help-browser/et -@dirrm share/gnome/help/help-browser/eu -@dirrm share/gnome/help/help-browser/fr -@dirrm share/gnome/help/help-browser/hu -@dirrm share/gnome/help/help-browser/it -@dirrm share/gnome/help/help-browser/ja -@dirrm share/gnome/help/help-browser/ko -@dirrm share/gnome/help/help-browser/no -@dirrm share/gnome/help/help-browser/wa -@dirrm share/gnome/help/help-browser -@dirrm share/gnome/help/mini-commander_applet/C -@dirrm share/gnome/help/mini-commander_applet -@dirrm share/gnome/help +@dirrm share/gnome/pixmaps/tiles +@dirrm share/gnome/pixmaps/splash +@dirrm share/gnome/pixmaps/mailcheck +@dirrm share/gnome/pixmaps/fish @dirrm share/gnome/mc/templates @dirrm share/gnome/mc -@dirrm share/gnome/pixmaps/fish -@dirrm share/gnome/pixmaps/gkb -@dirrm share/gnome/pixmaps/mailcheck -@dirrm share/gnome/pixmaps/mini-commander -@dirrm share/gnome/pixmaps/tiles -@dirrm share/gnome/xmodmap +@dirrm share/gnome/html/panel +@dirrm share/gnome/hints +@dirrm share/gnome/help/tasklist_applet/C/stylesheet-images +@dirrm share/gnome/help/tasklist_applet/C +@dirrm share/gnome/help/tasklist_applet +@dirrm share/gnome/help/session/C/stylesheet-images +@dirrm share/gnome/help/session/C/figures +@dirrm share/gnome/help/session/C +@dirrm share/gnome/help/session +@dirrm share/gnome/help/printer_applet/da/stylesheet-images +@dirrm share/gnome/help/printer_applet/da +@dirrm share/gnome/help/printer_applet/C/stylesheet-images +@dirrm share/gnome/help/printer_applet/C +@dirrm share/gnome/help/printer_applet +@dirrm share/gnome/help/panel/it/stylesheet-images +@dirrm share/gnome/help/panel/it/figures +@dirrm share/gnome/help/panel/it +@dirrm share/gnome/help/panel/de/stylesheet-images +@dirrm share/gnome/help/panel/de/figures +@dirrm share/gnome/help/panel/de +@dirrm share/gnome/help/panel/C/stylesheet-images +@dirrm share/gnome/help/panel/C/figures +@dirrm share/gnome/help/panel/C +@dirrm share/gnome/help/panel +@dirrm share/gnome/help/mailcheck_applet/da/stylesheet-images +@dirrm share/gnome/help/mailcheck_applet/da +@dirrm share/gnome/help/mailcheck_applet/C/stylesheet-images +@dirrm share/gnome/help/mailcheck_applet/C +@dirrm share/gnome/help/mailcheck_applet +@dirrm share/gnome/help/help-browser/wa +@dirrm share/gnome/help/help-browser/uk +@dirrm share/gnome/help/help-browser/no +@dirrm share/gnome/help/help-browser/lt +@dirrm share/gnome/help/help-browser/ko +@dirrm share/gnome/help/help-browser/ja +@dirrm share/gnome/help/help-browser/it +@dirrm share/gnome/help/help-browser/hu +@dirrm share/gnome/help/help-browser/gl +@dirrm share/gnome/help/help-browser/fr +@dirrm share/gnome/help/help-browser/eu +@dirrm share/gnome/help/help-browser/et +@dirrm share/gnome/help/help-browser/es +@dirrm share/gnome/help/help-browser/el +@dirrm share/gnome/help/help-browser/da +@dirrm share/gnome/help/help-browser/ca +@dirrm share/gnome/help/help-browser/C +@dirrm share/gnome/help/help-browser +@dirrm share/gnome/help/gnome-terminal/no/stylesheet-images +@dirrm share/gnome/help/gnome-terminal/no/figures +@dirrm share/gnome/help/gnome-terminal/no +@dirrm share/gnome/help/gnome-terminal/it/stylesheet-images +@dirrm share/gnome/help/gnome-terminal/it/figures +@dirrm share/gnome/help/gnome-terminal/it +@dirrm share/gnome/help/gnome-terminal/es/stylesheet-images +@dirrm share/gnome/help/gnome-terminal/es/figures +@dirrm share/gnome/help/gnome-terminal/es +@dirrm share/gnome/help/gnome-terminal/de +@dirrm share/gnome/help/gnome-terminal/da/stylesheet-images +@dirrm share/gnome/help/gnome-terminal/da/figures +@dirrm share/gnome/help/gnome-terminal/da +@dirrm share/gnome/help/gnome-terminal/C/stylesheet-images +@dirrm share/gnome/help/gnome-terminal/C/figures +@dirrm share/gnome/help/gnome-terminal/C +@dirrm share/gnome/help/gnome-terminal +@dirrm share/gnome/help/gen_util_applet/no/stylesheet-images +@dirrm share/gnome/help/gen_util_applet/no +@dirrm share/gnome/help/gen_util_applet/de/stylesheet-images +@dirrm share/gnome/help/gen_util_applet/de +@dirrm share/gnome/help/gen_util_applet +@dirrm share/gnome/help/fish_applet/no/stylesheet-images +@dirrm share/gnome/help/fish_applet/no +@dirrm share/gnome/help/fish_applet/da/stylesheet-images +@dirrm share/gnome/help/fish_applet/da +@dirrm share/gnome/help/fish_applet/C/stylesheet-images +@dirrm share/gnome/help/fish_applet/C +@dirrm share/gnome/help/fish_applet +@dirrm share/gnome/help/desk-guide_applet/de/stylesheet-images +@dirrm share/gnome/help/desk-guide_applet/de +@dirrm share/gnome/help/desk-guide_applet/C/stylesheet-images +@dirrm share/gnome/help/desk-guide_applet/C +@dirrm share/gnome/help/desk-guide_applet +@dirrm share/gnome/help/clock_applet/da/stylesheet-images +@dirrm share/gnome/help/clock_applet/da +@dirrm share/gnome/help/clock_applet/C/stylesheet-images +@dirrm share/gnome/help/clock_applet/C +@dirrm share/gnome/help/clock_applet +@dirrm share/gnome/gnome-about +@dirrm share/gnome/apps/Utilities +@dirrm share/gnome/apps/System +@dirrm share/gnome/apps/Multimedia +@dirrm share/gnome/apps/Internet +@dirrm share/gnome/apps/Graphics +@dirrm share/gnome/apps/Games +@dirrm share/gnome/apps/Development +@dirrm share/gnome/apps/Applications +@dirrm share/gnome/applets/Utility +@dirrm share/gnome/applets/Network +@dirrm share/gnome/applets/Multimedia +@dirrm share/gnome/applets/Monitors +@dirrm share/gnome/applets/Clocks +@dirrm share/gnome/applets/Amusements +@dirrm share/gnome/applets diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile index 3d9d92543f29..e337e40e6b93 100644 --- a/x11/gnomelibs/Makefile +++ b/x11/gnomelibs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomelibs -PORTVERSION= 1.0.62 +PORTVERSION= 1.2.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-libs diff --git a/x11/gnomelibs/distinfo b/x11/gnomelibs/distinfo index ddcba6333ba2..00f11e8fa7a6 100644 --- a/x11/gnomelibs/distinfo +++ b/x11/gnomelibs/distinfo @@ -1 +1 @@ -MD5 (gnome-libs-1.0.62.tar.gz) = 61be1867df2e0a922480901b56ed57e7 +MD5 (gnome-libs-1.2.1.tar.gz) = 1e43e482069c79058ab6842d5294fe15 diff --git a/x11/gnomelibs/files/patch-bb b/x11/gnomelibs/files/patch-bb index 2ec913ffde33..fed78b9bfaa3 100644 --- a/x11/gnomelibs/files/patch-bb +++ b/x11/gnomelibs/files/patch-bb @@ -14,7 +14,7 @@ -libgtkxmhtml_la_LDFLAGS = -version-info 1:1:0 -rpath $(libdir) -+libgtkxmhtml_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgtkxmhtml_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgtkxmhtml_la_LIBADD = $(LIBGTKXMHTML_LIBS) noinst_PROGRAMS = htmltest diff --git a/x11/gnomelibs/files/patch-bc b/x11/gnomelibs/files/patch-bc index c4a44087e4ba..648706058bfe 100644 --- a/x11/gnomelibs/files/patch-bc +++ b/x11/gnomelibs/files/patch-bc @@ -5,7 +5,7 @@ EXTRA_DIST = parse-path.cP -libgnome_la_LDFLAGS = -version-info 35:11:3 #-rpath $(libdir) -+libgnome_la_LDFLAGS = -version-info 3:0:0 #-rpath $(libdir) ++libgnome_la_LDFLAGS = -version-info 4:0:0 #-rpath $(libdir) libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb diff --git a/x11/gnomelibs/files/patch-bd b/x11/gnomelibs/files/patch-bd index 3daa6e3eb9b2..abd17faef5c8 100644 --- a/x11/gnomelibs/files/patch-bd +++ b/x11/gnomelibs/files/patch-bd @@ -5,7 +5,7 @@ -libgnomeui_la_LDFLAGS = -version-info 43:2:11 -rpath $(libdir) -+libgnomeui_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnomeui_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) gnome_segv_LDADD = libgnomeui.la $(top_builddir)/libgnome/libgnome.la $(top_builddir)/libart_lgpl/libart_lgpl.la @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) $(INTLLIBS) diff --git a/x11/gnomelibs/files/patch-be b/x11/gnomelibs/files/patch-be index 324e5016abc8..aa269911e7db 100644 --- a/x11/gnomelibs/files/patch-be +++ b/x11/gnomelibs/files/patch-be @@ -5,7 +5,7 @@ -libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir) -+libgnorba_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnorba_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm loadshlib_SOURCES = loadshlib.c @@ -14,7 +14,7 @@ gnome-unknown-skels.lo gnome-unknown-stubs.lo gnome-unknown-common.lo \ goad.lo orbitgtk.lo orbitgnome.lo orbitns.lo -libgnorbagtk_la_LDFLAGS = -+libgnorbagtk_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnorbagtk_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnorbagtk_la_LIBADD = libgnorbagtk_la_OBJECTS = gnome-factory-skels.lo gnome-factory-stubs.lo \ gnome-factory-common.lo Table-skels.lo Table-stubs.lo Table-common.lo \ diff --git a/x11/gnomelibs/files/patch-bf b/x11/gnomelibs/files/patch-bf index 7bc59afd55d1..44e1d7a697e1 100644 --- a/x11/gnomelibs/files/patch-bf +++ b/x11/gnomelibs/files/patch-bf @@ -14,7 +14,7 @@ libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c libgnomesupport_la_LIBADD = @LTLIBOBJS@ -libgnomesupport_la_LDFLAGS = -version-info 0:0:0 -+libgnomesupport_la_LDFLAGS = -version-info 3:0:0 ++libgnomesupport_la_LDFLAGS = -version-info 4:0:0 BUILT_SOURCES = gnomesupport.h diff --git a/x11/gnomelibs/files/patch-bg b/x11/gnomelibs/files/patch-bg index be3ca87408dd..5405ccdf4607 100644 --- a/x11/gnomelibs/files/patch-bg +++ b/x11/gnomelibs/files/patch-bg @@ -14,7 +14,7 @@ -libzvt_la_LDFLAGS = -version-info 4:7:2 -rpath $(libdir) -+libzvt_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libzvt_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libzvtinclude_HEADERS = lists.h vt.h vtx.h zvtterm.h diff --git a/x11/gnomelibs/files/patch-bi b/x11/gnomelibs/files/patch-bi index 8aeb458ccc39..32e3836e806c 100644 --- a/x11/gnomelibs/files/patch-bi +++ b/x11/gnomelibs/files/patch-bi @@ -5,7 +5,7 @@ -libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@ -+libart_lgpl_la_LDFLAGS = -version-info 3:0:0 ++libart_lgpl_la_LDFLAGS = -version-info 4:0:0 libart_lgplincdir = $(includedir)/libart_lgpl libart_lgplinc_HEADERS = art_affine.h art_alphagamma.h art_bpath.h art_filterlevel.h art_gray_svp.h art_misc.h art_pathcode.h art_pixbuf.h art_point.h art_rect.h art_rect_svp.h art_rect_uta.h art_rgb.h art_rgb_affine.h art_rgb_bitmap_affine.h art_rgb_pixbuf_affine.h art_rgb_rgba_affine.h art_rgb_svp.h art_svp.h art_svp_ops.h art_svp_render_aa.h art_svp_vpath.h art_svp_vpath_stroke.h art_uta.h art_uta_ops.h art_uta_rect.h art_uta_vpath.h art_uta_svp.h art_vpath.h art_vpath_bpath.h art_vpath_svp.h diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist index 3e7d6f9bed51..87db9483d27b 100644 --- a/x11/gnomelibs/pkg-plist +++ b/x11/gnomelibs/pkg-plist @@ -63,6 +63,8 @@ include/libart_lgpl/art_vpath.h include/libart_lgpl/art_vpath_bpath.h include/libart_lgpl/art_vpath_dash.h include/libart_lgpl/art_vpath_svp.h +include/libart_lgpl/libart-features.h +include/libart_lgpl/libart.h include/libgnome/gnome-config.h include/libgnome/gnome-defs.h include/libgnome/gnome-dentry.h @@ -175,28 +177,28 @@ include/zvt/vtx.h include/zvt/zvtterm.h lib/libart_lgpl.a lib/libart_lgpl.so -lib/libart_lgpl.so.3 +lib/libart_lgpl.so.4 lib/libgnome.a lib/libgnome.so -lib/libgnome.so.3 +lib/libgnome.so.4 lib/libgnomesupport.a lib/libgnomesupport.so -lib/libgnomesupport.so.3 +lib/libgnomesupport.so.4 lib/libgnomeui.a lib/libgnomeui.so -lib/libgnomeui.so.3 +lib/libgnomeui.so.4 lib/libgnorba.a lib/libgnorba.so -lib/libgnorba.so.3 +lib/libgnorba.so.4 lib/libgnorbagtk.a lib/libgnorbagtk.so -lib/libgnorbagtk.so.3 +lib/libgnorbagtk.so.4 lib/libgtkxmhtml.a lib/libgtkxmhtml.so -lib/libgtkxmhtml.so.3 +lib/libgtkxmhtml.so.4 lib/libzvt.a lib/libzvt.so -lib/libzvt.so.3 +lib/libzvt.so.4 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/aclocal/libart.m4 diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 3d9d92543f29..e337e40e6b93 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomelibs -PORTVERSION= 1.0.62 +PORTVERSION= 1.2.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-libs diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index ddcba6333ba2..00f11e8fa7a6 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1 +1 @@ -MD5 (gnome-libs-1.0.62.tar.gz) = 61be1867df2e0a922480901b56ed57e7 +MD5 (gnome-libs-1.2.1.tar.gz) = 1e43e482069c79058ab6842d5294fe15 diff --git a/x11/libgnome/files/patch-bb b/x11/libgnome/files/patch-bb index 2ec913ffde33..fed78b9bfaa3 100644 --- a/x11/libgnome/files/patch-bb +++ b/x11/libgnome/files/patch-bb @@ -14,7 +14,7 @@ -libgtkxmhtml_la_LDFLAGS = -version-info 1:1:0 -rpath $(libdir) -+libgtkxmhtml_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgtkxmhtml_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgtkxmhtml_la_LIBADD = $(LIBGTKXMHTML_LIBS) noinst_PROGRAMS = htmltest diff --git a/x11/libgnome/files/patch-bc b/x11/libgnome/files/patch-bc index c4a44087e4ba..648706058bfe 100644 --- a/x11/libgnome/files/patch-bc +++ b/x11/libgnome/files/patch-bc @@ -5,7 +5,7 @@ EXTRA_DIST = parse-path.cP -libgnome_la_LDFLAGS = -version-info 35:11:3 #-rpath $(libdir) -+libgnome_la_LDFLAGS = -version-info 3:0:0 #-rpath $(libdir) ++libgnome_la_LDFLAGS = -version-info 4:0:0 #-rpath $(libdir) libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb diff --git a/x11/libgnome/files/patch-bd b/x11/libgnome/files/patch-bd index 3daa6e3eb9b2..abd17faef5c8 100644 --- a/x11/libgnome/files/patch-bd +++ b/x11/libgnome/files/patch-bd @@ -5,7 +5,7 @@ -libgnomeui_la_LDFLAGS = -version-info 43:2:11 -rpath $(libdir) -+libgnomeui_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnomeui_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) gnome_segv_LDADD = libgnomeui.la $(top_builddir)/libgnome/libgnome.la $(top_builddir)/libart_lgpl/libart_lgpl.la @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) $(INTLLIBS) diff --git a/x11/libgnome/files/patch-be b/x11/libgnome/files/patch-be index 324e5016abc8..aa269911e7db 100644 --- a/x11/libgnome/files/patch-be +++ b/x11/libgnome/files/patch-be @@ -5,7 +5,7 @@ -libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir) -+libgnorba_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnorba_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm loadshlib_SOURCES = loadshlib.c @@ -14,7 +14,7 @@ gnome-unknown-skels.lo gnome-unknown-stubs.lo gnome-unknown-common.lo \ goad.lo orbitgtk.lo orbitgnome.lo orbitns.lo -libgnorbagtk_la_LDFLAGS = -+libgnorbagtk_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnorbagtk_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnorbagtk_la_LIBADD = libgnorbagtk_la_OBJECTS = gnome-factory-skels.lo gnome-factory-stubs.lo \ gnome-factory-common.lo Table-skels.lo Table-stubs.lo Table-common.lo \ diff --git a/x11/libgnome/files/patch-bf b/x11/libgnome/files/patch-bf index 7bc59afd55d1..44e1d7a697e1 100644 --- a/x11/libgnome/files/patch-bf +++ b/x11/libgnome/files/patch-bf @@ -14,7 +14,7 @@ libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c libgnomesupport_la_LIBADD = @LTLIBOBJS@ -libgnomesupport_la_LDFLAGS = -version-info 0:0:0 -+libgnomesupport_la_LDFLAGS = -version-info 3:0:0 ++libgnomesupport_la_LDFLAGS = -version-info 4:0:0 BUILT_SOURCES = gnomesupport.h diff --git a/x11/libgnome/files/patch-bg b/x11/libgnome/files/patch-bg index be3ca87408dd..5405ccdf4607 100644 --- a/x11/libgnome/files/patch-bg +++ b/x11/libgnome/files/patch-bg @@ -14,7 +14,7 @@ -libzvt_la_LDFLAGS = -version-info 4:7:2 -rpath $(libdir) -+libzvt_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libzvt_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libzvtinclude_HEADERS = lists.h vt.h vtx.h zvtterm.h diff --git a/x11/libgnome/files/patch-bi b/x11/libgnome/files/patch-bi index 8aeb458ccc39..32e3836e806c 100644 --- a/x11/libgnome/files/patch-bi +++ b/x11/libgnome/files/patch-bi @@ -5,7 +5,7 @@ -libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@ -+libart_lgpl_la_LDFLAGS = -version-info 3:0:0 ++libart_lgpl_la_LDFLAGS = -version-info 4:0:0 libart_lgplincdir = $(includedir)/libart_lgpl libart_lgplinc_HEADERS = art_affine.h art_alphagamma.h art_bpath.h art_filterlevel.h art_gray_svp.h art_misc.h art_pathcode.h art_pixbuf.h art_point.h art_rect.h art_rect_svp.h art_rect_uta.h art_rgb.h art_rgb_affine.h art_rgb_bitmap_affine.h art_rgb_pixbuf_affine.h art_rgb_rgba_affine.h art_rgb_svp.h art_svp.h art_svp_ops.h art_svp_render_aa.h art_svp_vpath.h art_svp_vpath_stroke.h art_uta.h art_uta_ops.h art_uta_rect.h art_uta_vpath.h art_uta_svp.h art_vpath.h art_vpath_bpath.h art_vpath_svp.h diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 3e7d6f9bed51..87db9483d27b 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -63,6 +63,8 @@ include/libart_lgpl/art_vpath.h include/libart_lgpl/art_vpath_bpath.h include/libart_lgpl/art_vpath_dash.h include/libart_lgpl/art_vpath_svp.h +include/libart_lgpl/libart-features.h +include/libart_lgpl/libart.h include/libgnome/gnome-config.h include/libgnome/gnome-defs.h include/libgnome/gnome-dentry.h @@ -175,28 +177,28 @@ include/zvt/vtx.h include/zvt/zvtterm.h lib/libart_lgpl.a lib/libart_lgpl.so -lib/libart_lgpl.so.3 +lib/libart_lgpl.so.4 lib/libgnome.a lib/libgnome.so -lib/libgnome.so.3 +lib/libgnome.so.4 lib/libgnomesupport.a lib/libgnomesupport.so -lib/libgnomesupport.so.3 +lib/libgnomesupport.so.4 lib/libgnomeui.a lib/libgnomeui.so -lib/libgnomeui.so.3 +lib/libgnomeui.so.4 lib/libgnorba.a lib/libgnorba.so -lib/libgnorba.so.3 +lib/libgnorba.so.4 lib/libgnorbagtk.a lib/libgnorbagtk.so -lib/libgnorbagtk.so.3 +lib/libgnorbagtk.so.4 lib/libgtkxmhtml.a lib/libgtkxmhtml.so -lib/libgtkxmhtml.so.3 +lib/libgtkxmhtml.so.4 lib/libzvt.a lib/libzvt.so -lib/libzvt.so.3 +lib/libzvt.so.4 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/aclocal/libart.m4 |