head 1.12; access; symbols pkgsrc-2019Q2:1.11.0.88 pkgsrc-2019Q2-base:1.11 pkgsrc-2019Q1:1.11.0.86 pkgsrc-2019Q1-base:1.11 pkgsrc-2018Q4:1.11.0.84 pkgsrc-2018Q4-base:1.11 pkgsrc-2018Q3:1.11.0.82 pkgsrc-2018Q3-base:1.11 pkgsrc-2018Q2:1.11.0.80 pkgsrc-2018Q2-base:1.11 pkgsrc-2018Q1:1.11.0.78 pkgsrc-2018Q1-base:1.11 pkgsrc-2017Q4:1.11.0.76 pkgsrc-2017Q4-base:1.11 pkgsrc-2017Q3:1.11.0.74 pkgsrc-2017Q3-base:1.11 pkgsrc-2017Q2:1.11.0.70 pkgsrc-2017Q2-base:1.11 pkgsrc-2017Q1:1.11.0.68 pkgsrc-2017Q1-base:1.11 pkgsrc-2016Q4:1.11.0.66 pkgsrc-2016Q4-base:1.11 pkgsrc-2016Q3:1.11.0.64 pkgsrc-2016Q3-base:1.11 pkgsrc-2016Q2:1.11.0.62 pkgsrc-2016Q2-base:1.11 pkgsrc-2016Q1:1.11.0.60 pkgsrc-2016Q1-base:1.11 pkgsrc-2015Q4:1.11.0.58 pkgsrc-2015Q4-base:1.11 pkgsrc-2015Q3:1.11.0.56 pkgsrc-2015Q3-base:1.11 pkgsrc-2015Q2:1.11.0.54 pkgsrc-2015Q2-base:1.11 pkgsrc-2015Q1:1.11.0.52 pkgsrc-2015Q1-base:1.11 pkgsrc-2014Q4:1.11.0.50 pkgsrc-2014Q4-base:1.11 pkgsrc-2014Q3:1.11.0.48 pkgsrc-2014Q3-base:1.11 pkgsrc-2014Q2:1.11.0.46 pkgsrc-2014Q2-base:1.11 pkgsrc-2014Q1:1.11.0.44 pkgsrc-2014Q1-base:1.11 pkgsrc-2013Q4:1.11.0.42 pkgsrc-2013Q4-base:1.11 pkgsrc-2013Q3:1.11.0.40 pkgsrc-2013Q3-base:1.11 pkgsrc-2013Q2:1.11.0.38 pkgsrc-2013Q2-base:1.11 pkgsrc-2013Q1:1.11.0.36 pkgsrc-2013Q1-base:1.11 pkgsrc-2012Q4:1.11.0.34 pkgsrc-2012Q4-base:1.11 pkgsrc-2012Q3:1.11.0.32 pkgsrc-2012Q3-base:1.11 pkgsrc-2012Q2:1.11.0.30 pkgsrc-2012Q2-base:1.11 pkgsrc-2012Q1:1.11.0.28 pkgsrc-2012Q1-base:1.11 pkgsrc-2011Q4:1.11.0.26 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q3:1.11.0.24 pkgsrc-2011Q3-base:1.11 pkgsrc-2011Q2:1.11.0.22 pkgsrc-2011Q2-base:1.11 pkgsrc-2011Q1:1.11.0.20 pkgsrc-2011Q1-base:1.11 pkgsrc-2010Q4:1.11.0.18 pkgsrc-2010Q4-base:1.11 pkgsrc-2010Q3:1.11.0.16 pkgsrc-2010Q3-base:1.11 pkgsrc-2010Q2:1.11.0.14 pkgsrc-2010Q2-base:1.11 pkgsrc-2010Q1:1.11.0.12 pkgsrc-2010Q1-base:1.11 pkgsrc-2009Q4:1.11.0.10 pkgsrc-2009Q4-base:1.11 pkgsrc-2009Q3:1.11.0.8 pkgsrc-2009Q3-base:1.11 pkgsrc-2009Q2:1.11.0.6 pkgsrc-2009Q2-base:1.11 pkgsrc-2009Q1:1.11.0.4 pkgsrc-2009Q1-base:1.11 pkgsrc-2008Q4:1.11.0.2 pkgsrc-2008Q4-base:1.11 pkgsrc-2008Q3:1.10.0.8 pkgsrc-2008Q3-base:1.10 cube-native-xorg:1.10.0.6 cube-native-xorg-base:1.10 pkgsrc-2008Q2:1.10.0.4 pkgsrc-2008Q2-base:1.10 cwrapper:1.10.0.2 pkgsrc-2008Q1:1.9.0.4 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.2 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.8.0.4 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.2 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.7.0.8 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.6 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.4 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.2 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.6.0.12 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.10 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.8 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.6 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.4 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.2 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.5.0.4 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.2 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.1.1.1.0.2 netbsd-1-6-1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.12 date 2019.09.16.10.53.23; author nia; state dead; branches; next 1.11; commitid 7IAX00xDF9ER2eDB; 1.11 date 2008.10.16.18.17.30; author drochner; state Exp; branches; next 1.10; 1.10 date 2008.04.15.18.06.15; author drochner; state Exp; branches; next 1.9; 1.9 date 2007.11.05.19.21.48; author drochner; state Exp; branches; next 1.8; 1.8 date 2007.04.11.20.25.38; author drochner; state Exp; branches; next 1.7; 1.7 date 2006.04.01.17.36.41; author jmmv; state Exp; branches; next 1.6; 1.6 date 2004.10.26.21.09.47; author jmmv; state Exp; branches; next 1.5; 1.5 date 2004.05.15.16.41.58; author jmmv; state Exp; branches; next 1.4; 1.4 date 2004.04.01.18.48.11; author jmmv; state Exp; branches; next 1.3; 1.3 date 2003.02.18.20.52.09; author jmmv; state dead; branches; next 1.2; 1.2 date 2003.02.14.21.08.39; author jmmv; state Exp; branches; next 1.1; 1.1 date 2002.09.15.06.03.04; author rh; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.09.15.06.03.04; author rh; state Exp; branches; next ; desc @@ 1.12 log @Remove x11/gnome-session successor x11/mate-session-manager @ text @$NetBSD: patch-aa,v 1.11 2008/10/16 18:17:30 drochner Exp $ --- gnome-session/Makefile.in.orig 2008-09-22 23:30:18.000000000 +0200 +++ gnome-session/Makefile.in @@@@ -312,7 +312,7 @@@@ INCLUDES = \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DGLADEDIR=\""$(pkgdatadir)"\" \ -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \ - -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" + -DGCONFTOOL_CMD=\"$(REAL_GCONFTOOL)\" test_inhibit_SOURCES = \ test-inhibit.c \ @ 1.11 log @update to 2.24.0 This switches to the gnome-2.24 release branch. @ text @d1 1 a1 1 $NetBSD$ @ 1.10 log @update to 2.22.1.1 This switches to the gnome-2.22 release branch. @ text @d3 1 a3 1 --- gnome-session/Makefile.in.orig 2008-03-10 22:01:44.000000000 +0100 d5 9 a13 9 @@@@ -301,7 +301,7 @@@@ INCLUDES = \ -DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\" \ -DGNOME_ICONDIR=\""$(datadir)/pixmaps\"" \ -DRSH_COMMAND=\""$(RSH_COMMAND)\"" \ - -DGCONFTOOL_CMD=\""$(GCONFTOOL)\"" \ + -DGCONFTOOL_CMD=\""$(REAL_GCONFTOOL)\"" \ -DDEFAULTDIR="\"$(defaultdir)\"" \ -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \ -DTIME_UTILITY="\"$(TIME_UTILITY)\"" \ @ 1.9 log @update to 2.20.1 This switches to the new gnome-2.20 branch. @ text @d3 1 a3 1 --- gnome-session/Makefile.in.orig 2007-09-17 20:55:46.000000000 +0200 d5 1 a5 1 @@@@ -311,7 +311,7 @@@@ INCLUDES = \ a11 1 -DESD_SERVER="\"$(ESD_SERVER)\"" \ d13 1 @ 1.8 log @update to 2.18.0 This moves this pkg to the new stable gnome branch, too much to list here. pkgsrc note: automatic dbus startup doesn't work well, it seems to conflict with another dbus autostart. Better start the session with "dbus-launch". gdm-2.18 will take care of that. @ text @d3 1 a3 1 --- gnome-session/Makefile.in.orig 2007-03-12 19:59:22.000000000 +0100 d5 1 a5 1 @@@@ -309,7 +309,7 @@@@ INCLUDES = \ d13 1 a13 1 -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" @ 1.7 log @Make gnome-session spawn a dbus-daemon for the current session so that things work "out of the box" again: some programs now require dbus to even start up (e.g. epiphany). Bump PKGREVISION to 1. The code comes from GNOME's bug 336237 and I'm adding it to the package so that it can get some testing. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2004/10/26 21:09:47 jmmv Exp $ d3 1 a3 4 http://bugzilla.gnome.org/show_bug.cgi?id=336237 The GONFTOOL_CMD change does not belong to the bug report! --- gnome-session/Makefile.in.orig 2006-03-13 21:53:02.000000000 +0100 d5 3 a7 12 @@@@ -65,7 +65,7 @@@@ am__objects_1 = egg-screen-exec.$(OBJEXT am_gnome_session_OBJECTS = manager.$(OBJEXT) ice.$(OBJEXT) \ main.$(OBJEXT) prop.$(OBJEXT) save.$(OBJEXT) command.$(OBJEXT) \ remote.$(OBJEXT) logout.$(OBJEXT) splash-widget.$(OBJEXT) \ - gsm-xrandr.$(OBJEXT) gsm-keyring.$(OBJEXT) gsm-gsd.$(OBJEXT) \ + gsm-xrandr.$(OBJEXT) gsm-dbus.$(OBJEXT) gsm-keyring.$(OBJEXT) gsm-gsd.$(OBJEXT) \ gsm-protocol.$(OBJEXT) gsm-remote-desktop.$(OBJEXT) \ gsm-sound.$(OBJEXT) gsm-at-startup.$(OBJEXT) \ gsm-multiscreen.$(OBJEXT) gsm-typebuiltins.$(OBJEXT) \ @@@@ -323,7 +323,7 @@@@ INCLUDES = \ -DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\"" \ -DHALT_COMMAND=\""$(HALT_COMMAND)\"" \ d12 2 a13 19 -DESD_SERVER="\"$(ESD_SERVER)\"" @@@@ -386,6 +386,8 @@@@ gnome_session_SOURCES = \ splash-widget.h \ gsm-xrandr.c \ gsm-xrandr.h \ + gsm-dbus.c \ + gsm-dbus.h \ gsm-keyring.c \ gsm-keyring.h \ gsm-gsd.c \ @@@@ -602,6 +604,7 @@@@ distclean-compile: @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/gsm-client-list.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/gsm-client-row.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/gsm-gsd.Po@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/gsm-dbus.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/gsm-keyring.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/gsm-multiscreen.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/gsm-protocol.Po@@am__quote@@ @ 1.6 log @Update to 2.8.1: Session Manager * Don't crash gnome-session-remove if we can't get a program name (Ray Strode) * Add a big bunch of debug spew (Federico) * Don't leak the splash screen background image (Kjartan) * Remove the purge timeout when re-incarnating a client (Federico) Misc * Use automake 1.7 (James Henstridge) Translators * Adam Weinberger (en_CA) * Changwoo Ryu (ko) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2004/05/15 16:41:58 jmmv Exp $ d3 4 a6 1 --- gnome-session/Makefile.in.orig 2004-10-12 17:57:42.000000000 +0200 d8 10 a17 1 @@@@ -221,7 +221,7 @@@@ INCLUDES = \ d26 17 @ 1.5 log @Update to 2.6.1: Fixes * Fix a crash with the logout dialog on multi-screen setups (Mark) Translators * Zuza Software Foundation (af) * Hizkuntza Politikarako Sailburuordetza (eu) * Guntupalli Karunakar (gu) * John C Barstow (mi) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2004/04/01 18:48:11 jmmv Exp $ d3 1 a3 1 --- gnome-session/Makefile.in.orig 2004-04-19 16:29:22.000000000 +0200 d5 8 a12 1 @@@@ -155,7 +155,7 @@@@ NULL = a13 7 defaultdir = $(datadir)/gnome -INCLUDES = $(GNOME_SESSION_CFLAGS) $(STANDARD_PROPERTIES_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale\"" -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" -DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\" -DGNOME_ICONDIR=\""$(datadir)/pixmaps\"" -DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\"" -DHALT_COMMAND=\""$(HALT_COMMAND)\"" -DRSH_COMMAND=\""$(RSH_COMMAND)\"" -DGCONFTOOL_CMD=\""$(GCONFTOOL)\"" -DDEFAULTDIR="\"$(defaultdir)\"" -DESD_SERVER="\"$(ESD_SERVER)\"" +INCLUDES = $(GNOME_SESSION_CFLAGS) $(STANDARD_PROPERTIES_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale\"" -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" -DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\" -DGNOME_ICONDIR=\""$(datadir)/pixmaps\"" -DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\"" -DHALT_COMMAND=\""$(HALT_COMMAND)\"" -DRSH_COMMAND=\""$(RSH_COMMAND)\"" -DGCONFTOOL_CMD=\""$(REAL_GCONFTOOL)\"" -DDEFAULTDIR="\"$(defaultdir)\"" -DESD_SERVER="\"$(ESD_SERVER)\"" # Used by the GNOME_PROGRAM_STANDARD_PROPERTIES macros @ 1.4 log @Update to 2.6.0: Version 2.6.0 ============= Translators * Alexander Winston (en_CA) * Gareth Owen (en_GB) * Jitendra Shah (mr) * Mişu Moldovan (ro) * Leonid Kanter (ru) Version 2.5.92 ============== Translators * Vladimir \"Kaladan\" Petkov (bg) * Dinesh Nadarajah (ta) * Maxim Dziumanenko (uk) Version 2.5.91 ============== Session Manager * New splash screen for 2.6 (Jakub Steiner) * Make the capplet use GtkFileChooser (Chris Kelso) Translations * Mətin Əmirov (az) * Laszlo Dvornik (hu) * Christopher R. Gabriel (it) * Amanpreet Singh Alam (pa) * Paisa Seeluangsawat (th) Version 2.5.90 ============== Translations * Laurent Dhima (sq) * Paisa Seeluangsawat (th) Version 2.5.5 ============= Session Manager * Set accessible role on the logout dialog (Padraig) * Update help links to the new user-guide location (Mark) Session Properties Dialog * Make Escape actually with the warning dialog (Bala) * Don't warn user about discarding changes if no changes have been made (Bala) Translators * Changwoo Ryu (ko) * Robert Sedak (hr) * Maxim Dziumanenko (uk) Version 2.5.4 ============= Session Manager * Don't show silly icon when we can't find an splash icon (Glynn) * Update the icon map (Luca Ferretti) * Fix usage of deprecated function (Kjartan) Misc * Fix issue with underquoted definition of AM_PATH_ESD (Alexander Winston) * Kill unused .desktop file (Mark) * Update support for lwm (James F. Carter) * Add support for openbox (Michael Terry) Translators * Kjartan Maraas (no) * Laurent Dhima (sq) * Miloslav Trmac (cs) * Mətin Əmirov (az) * Reinout van Schouwen (nl) Version 2.5.3 ============= Session Manager * Fix lock-up on log out with glib 2.3.1 (Mark) * Use a managed window for the logout dialog when accessibility is enabled (Mark, Bill Haneman) * Require gtk+ 2.3.x and dump the pangox coverage cache hack (Mark) Translators * Duarte Loreto (pt) * Isam Bayazidi (ar) * Paul Duffy (ga) * Sanlig Badral (mn) Version 2.5.2 ============= Session Manager * Start the gnome-keyring daemon at login (Alexander Larsson) * Shut down the GConf daemon at logout (W. Michael Petullo, Mark) * Don't set the full path of the splash screen in GConf (Mark) Translators * Kostas Papadimas (el) * Paisa Seeluangsawat (th) Version 2.5.1 ============= Misc * Add a --enable-deprecations build flag (Mark) Translators Dafydd Harries (cy) Miloslav Trmac (cs) @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- gnome-session/Makefile.in.orig 2004-03-09 11:59:34.000000000 +0100 d5 1 a5 8 @@@@ -164,7 +164,7 @@@@ INCLUDES = \ -DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\"" \ -DHALT_COMMAND=\""$(HALT_COMMAND)\"" \ -DRSH_COMMAND=\""$(RSH_COMMAND)\"" \ - -DGCONFTOOL_CMD=\""$(GCONFTOOL)\"" \ + -DGCONFTOOL_CMD=\""$(REAL_GCONFTOOL)\"" \ -DDEFAULTDIR="\"$(defaultdir)\"" \ -DESD_SERVER="\"$(ESD_SERVER)\"" d7 7 @ 1.3 log @GConf2's buildlink2.mk now creates a gconftool-2 wrapper which prevents the configuration database from beeing modified by packages that do not honour the --disable-schemas-install option. There is no need to patch these broken packages any more. Okay'ed by wiz. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2003/02/14 21:08:39 jmmv Exp $ d3 1 a3 1 --- gnome-session/Makefile.in.orig 2003-02-04 00:00:04.000000000 +0100 d5 8 a12 1 @@@@ -658,7 +658,7 @@@@ default.wm: default.wm.in ../config.stat a13 7 # don't do this if we are building in eg. rpm install-data-local: - if test -z "$(DESTDIR)" ; then \ + if false; then \ for p in $(schemas_DATA) ; do \ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnome-session/$$p ; \ done \ @ 1.2 log @Update to 2.2.0.2. Changes since 2.0.8: * Build fix (Thomas Vander Stichele) * Mark a couple of strings for translation (Yuriy Syrota) * Cool new splash screen (Jakub Steiner) * Up the slow client purge delay to 2 minutes (Mark) * Fix GsmProtocol initialisation problem (Mark) * Ensure child dialogs are kept above the parent (Satyajit) * Add startup notification flag to .desktop files (Dennis Cranston) * Unref the GConfCliet (Brian Cameron) * Add X-GNOME-BUGZILLA to the .desktop files (Fernando Herrera) * Fixup manpages (Christian Marillat, Mark, Alex Duggan) * Update application icons map (Evandro Fernandes Giovanini) * Fixup Xinerama aware logout iris code (Mark) * Allow splash screen to be configured (Rodney Dawes) * Use intltool to merge schmemas translations (Mark) * Use metacity for the window manager by default (Jacob) * Multiscreen support for logout iris and dialog (Mark) * Use "Order" instead of "Priority" in the capplet (Mark) * New translations. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 2002/09/15 06:03:04 rh Exp $ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- gnome-session/Makefile.in.orig Thu Sep 5 12:25:10 2002 d5 1 a5 48 @@@@ -413,6 +413,8 @@@@ install-man1: ext=`echo $$i | sed -e 's/^.*\\.//'`; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + inst=`echo $$inst | sed 's/save/gnome2-save/'`; \ + inst=`echo $$inst | sed 's/session-prop/gnome2-session-prop/'`; \ echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ done @@@@ -447,7 +449,7 @@@@ install-man5: inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/gnome2-$$inst; \ done uninstall-man5: @@@@ -477,10 +479,10 @@@@ install-defaultDATA: $(default_DATA) @@list='$(default_DATA)'; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defaultdir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defaultdir)/$$p; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defaultdir)/gnome2-$$p; \ else if test -f $$p; then \ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(defaultdir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(defaultdir)/$$p; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(defaultdir)/gnome2-$$p; \ fi; fi; \ done @@@@ -494,12 +496,13 @@@@ install-pixmapDATA: $(pixmap_DATA) @@$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pixmapdir) @@list='$(pixmap_DATA)'; for p in $$list; do \ + inst=`echo $$p | sed '$(transform)'`; \ if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p; \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$inst"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$inst; \ else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$p; \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$inst"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$inst; \ fi; fi; \ done d7 7 @ 1.1.1.1 log @Initial import of gnome-session-2.0.7, the GNOME2 session manager. Provided by Julio Merino , with some modifications to make this co-exist with gnome-core. Closes PR pkg/18221 @ text @@