--- ./src/EXTRAS/online-help.txt.00 2000-05-01 20:02:43.000000000 +0200 +++ ./src/EXTRAS/online-help.txt 2007-02-18 19:00:54.000000000 +0100 @@ -1,4 +1,4 @@ -mount.app - the mount maker +wmmnt - the mount maker ** Copyright (C) 1998 Steve Borho ** @@ -83,7 +83,7 @@ 4. So you're telling me I have to mount/unmount my CDs and floppies by hand? -That's where mount.app comes in, to make it as painless as possible to +That's where wmmnt comes in, to make it as painless as possible to handle your removeable media and to add a few ammenities that you won't be able to live without, like having real-time capacity statistics and ejecting drives as you unmount them. --- ./src/mount.c.00 2007-02-18 15:46:09.000000000 +0100 +++ ./src/mount.c 2007-02-18 19:02:57.000000000 +0100 @@ -111,7 +111,7 @@ if (i >= aiPtr->numMounts) { fprintf(stderr, -"mount.app defaults to not showing non-user mountable devices.\n" +"wmmnt defaults to not showing non-user mountable devices.\n" "Currently, all mount points are marked as 'Do not show'. Which\n" "probably means that none of your devices are user mountable.\n" "I'm 'un-ignoring' %s temporarily just so I have something to show\n", @@ -513,7 +513,7 @@ void printHelp(int argc, char *argv[]) { - fprintf(stderr, "mount.app %s - the WindowMaker universal mount point\n", + fprintf(stderr, "wmmnt %s - the WindowMaker universal mount point\n", VERSION); fprintf(stderr, "Copyright (C) 1999, 2002 Steve Borho \n"); fprintf(stderr, "This software comes with ABSOLUTELY NO WARRANTY\n"); --- ./src/config.c.00 2002-12-06 16:14:02.000000000 +0100 +++ ./src/config.c 2007-02-18 19:02:20.000000000 +0100 @@ -173,7 +173,7 @@ GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(dialog)); - label = gtk_label_new("mount.app Online help"); + label = gtk_label_new("wmmnt Online help"); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), label, TRUE, TRUE, 0); gtk_widget_show(label); @@ -254,7 +254,7 @@ */ window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_container_border_width(GTK_CONTAINER(window), 10); - gtk_window_set_title(GTK_WINDOW(window), "mount.app Configurator"); + gtk_window_set_title(GTK_WINDOW(window), "wmmnt Configurator"); gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(destroy), NULL); gtk_signal_connect(GTK_OBJECT(window), "delete_event", @@ -815,7 +815,7 @@ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolTip), fileNameEntry, "The filename of the pixmap which will be used for this " "icon type. " - "Any changes you make will not take effect until mount.app " + "Any changes you make will not take effect until wmmnt " "is restarted.", NULL); @@ -846,7 +846,7 @@ gtk_box_pack_start(GTK_BOX(pickBox), entry, TRUE, TRUE, 0); gtk_tooltips_set_tip(GTK_TOOLTIPS(toolTip), entry, - "This is the directory where mount.app will look for all " + "This is the directory where wmmnt will look for all " "of it's pixmaps.", NULL); /* @@ -918,7 +918,7 @@ GTK_SIGNAL_FUNC(cycleClicked), NULL); gtk_tooltips_set_tip(GTK_TOOLTIPS(toolTip), button, - "Make mount.app cycle " + "Make wmmnt cycle " "through all the mount points when it is idle " "(ie. no events for 5 seconds).", NULL); @@ -1101,7 +1101,7 @@ gtk_widget_show(ignoreCB); gtk_tooltips_set_tip(GTK_TOOLTIPS(toolTip), ignoreCB, - "When this button is down, mount.app will not display this " + "When this button is down, wmmnt will not display this " "mount point", NULL); @@ -1155,7 +1155,7 @@ gtk_box_pack_start(GTK_BOX(configBox), firstCB, TRUE, TRUE, 5); gtk_tooltips_set_tip(GTK_TOOLTIPS(toolTip), firstCB, - "When this button is down, mount.app will display this " + "When this button is down, wmmnt will display this " "mount point first", NULL); @@ -1214,7 +1214,7 @@ gtk_box_pack_start(GTK_BOX(configBox), vbox, TRUE, TRUE, 0); gtk_tooltips_set_tip(GTK_TOOLTIPS(toolTip), nameEntry, - "This is the name which will be displayed by mount.app " + "This is the name which will be displayed by wmmnt " "when viewing this mount point", NULL); @@ -1244,7 +1244,7 @@ void printConfigHelp(int argc, char *argv[]) { - fprintf(stderr, "mount.conf %s - Configurator for mount.app\n", VERSION); + fprintf(stderr, "wmmnt.conf %s - Configurator for wmmnt\n", VERSION); fprintf(stderr, "Copyright (C) 1998, 2002 Steve Borho \n"); fprintf(stderr, "This software comes with ABSOLUTELY NO WARRANTY\n"); fprintf(stderr, "This software is free software, and you are welcome " @@ -1258,7 +1258,7 @@ fprintf(stderr, " -i ignore NFS mounts\n"); fprintf(stderr, " -s SIGHUP parent when saving\n"); fprintf(stderr, " -m specify initial mount point\n"); - fprintf(stderr, "\nThis is intended to be called internally by mount.app\n"); + fprintf(stderr, "\nThis is intended to be called internally by wmmnt\n"); exit(0); } --- ./src/external.c.00 2000-05-01 20:02:43.000000000 +0200 +++ ./src/external.c 2007-02-18 19:04:31.000000000 +0100 @@ -135,7 +135,7 @@ char *argv[5] = {"config", "-s", "-m", ai->mpi[ai->curMount]->mountStr, 0}; - sprintf(buf, "%s/mount.conf", BINDIR); + sprintf(buf, "%s/wmmnt.conf", BINDIR); execv(buf, argv); exit(127); @@ -151,7 +151,7 @@ char *argv[3] = {"config", "-H", 0}; - sprintf(buf, "%s/mount.conf", BINDIR); + sprintf(buf, "%s/wmmnt.conf", BINDIR); execv(buf, argv); exit(127); --- ./src/Makefile.am.00 2000-05-01 20:02:43.000000000 +0200 +++ ./src/Makefile.am 2007-02-18 18:57:04.000000000 +0100 @@ -17,15 +17,15 @@ mexecbindir = @mountsdir@ mpixmapdir = @pixmapdir@ -mexecbin_PROGRAMS = mount.app mount.conf +mexecbin_PROGRAMS = wmmnt wmmnt.conf INCLUDES = @LIBPL_INC_PATH@ @XCFLAGS@ -mount_app_SOURCES = mount.c mount.h fstab.c properties.c external.c globals.c +wmmnt_SOURCES = mount.c mount.h fstab.c properties.c external.c globals.c -mount_conf_SOURCES = config.c mount.h fstab.c properties.c globals.c +wmmnt_conf_SOURCES = config.c mount.h fstab.c properties.c globals.c -mount_app_LDADD = @LIBPL_LIBS@ @XLFLAGS@ @XLIBS@ @X_EXTRA_LIBS@ @GFXLIBS@ -mount_conf_LDADD = @LIBPL_LIBS@ @GTK_LIBS@ @GFXLIBS@ @X_EXTRA_LIBS@ +wmmnt_LDADD = @LIBPL_LIBS@ @XLFLAGS@ @XLIBS@ @X_EXTRA_LIBS@ @GFXLIBS@ +wmmnt_conf_LDADD = @LIBPL_LIBS@ @GTK_LIBS@ @GFXLIBS@ @X_EXTRA_LIBS@ -CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @GFXFLAGS@ +AM_CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @GFXFLAGS@ --- ./src/properties.c.00 2007-02-18 15:46:05.000000000 +0100 +++ ./src/properties.c 2007-02-18 19:03:35.000000000 +0100 @@ -281,7 +281,7 @@ /* * If the icondir is the same as the compiled in default, - * then remove it from the config file. (in case mount.app + * then remove it from the config file. (in case wmmnt * gets recompiled with a new ICONDIR) */ if (strcmp(icondir, ICONDIR) == 0) @@ -480,7 +480,7 @@ return buf; /* Hacked by Michael Bueker: The config file simply gets - * written to $HOME/.mount.app/ instead of a dir related + * written to $HOME/.wmmnt/ instead of a dir related * to GNUstep. */ if (((home = getenv("HOME")) == 0) || strlen(home) > 100) @@ -489,7 +489,7 @@ exit(1); } - sprintf(buf, "%s/.mount.app/mount.app", home); + sprintf(buf, "%s/.wmmnt/wmmnt", home); return buf; } --- ./src/Makefile.in.00 2007-02-18 16:14:18.000000000 +0100 +++ ./src/Makefile.in 2007-02-18 18:57:56.000000000 +0100 @@ -46,7 +46,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -mexecbin_PROGRAMS = mount.app$(EXEEXT) mount.conf$(EXEEXT) +mexecbin_PROGRAMS = wmmnt$(EXEEXT) wmmnt.conf$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -59,14 +59,14 @@ am__installdirs = "$(DESTDIR)$(mexecbindir)" mexecbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(mexecbin_PROGRAMS) -am_mount_app_OBJECTS = mount.$(OBJEXT) fstab.$(OBJEXT) \ +am_wmmnt_OBJECTS = mount.$(OBJEXT) fstab.$(OBJEXT) \ properties.$(OBJEXT) external.$(OBJEXT) globals.$(OBJEXT) -mount_app_OBJECTS = $(am_mount_app_OBJECTS) -mount_app_DEPENDENCIES = -am_mount_conf_OBJECTS = config.$(OBJEXT) fstab.$(OBJEXT) \ +wmmnt_OBJECTS = $(am_wmmnt_OBJECTS) +wmmnt_DEPENDENCIES = +am_wmmnt_conf_OBJECTS = config.$(OBJEXT) fstab.$(OBJEXT) \ properties.$(OBJEXT) globals.$(OBJEXT) -mount_conf_OBJECTS = $(am_mount_conf_OBJECTS) -mount_conf_DEPENDENCIES = +wmmnt_conf_OBJECTS = $(am_wmmnt_conf_OBJECTS) +wmmnt_conf_DEPENDENCIES = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = am__depfiles_maybe = @@ -74,8 +74,8 @@ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(mount_app_SOURCES) $(mount_conf_SOURCES) -DIST_SOURCES = $(mount_app_SOURCES) $(mount_conf_SOURCES) +SOURCES = $(wmmnt_SOURCES) $(wmmnt_conf_SOURCES) +DIST_SOURCES = $(wmmnt_SOURCES) $(wmmnt_conf_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-exec-recursive install-info-recursive \ @@ -96,7 +96,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @GFXFLAGS@ +CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -200,10 +200,11 @@ mexecbindir = @mountsdir@ mpixmapdir = @pixmapdir@ INCLUDES = @LIBPL_INC_PATH@ @XCFLAGS@ -mount_app_SOURCES = mount.c mount.h fstab.c properties.c external.c globals.c -mount_conf_SOURCES = config.c mount.h fstab.c properties.c globals.c -mount_app_LDADD = @LIBPL_LIBS@ @XLFLAGS@ @XLIBS@ @X_EXTRA_LIBS@ @GFXLIBS@ -mount_conf_LDADD = @LIBPL_LIBS@ @GTK_LIBS@ @GFXLIBS@ @X_EXTRA_LIBS@ +wmmnt_SOURCES = mount.c mount.h fstab.c properties.c external.c globals.c +wmmnt_conf_SOURCES = config.c mount.h fstab.c properties.c globals.c +wmmnt_LDADD = @LIBPL_LIBS@ @XLFLAGS@ @XLIBS@ @X_EXTRA_LIBS@ @GFXLIBS@ +wmmnt_conf_LDADD = @LIBPL_LIBS@ @GTK_LIBS@ @GFXLIBS@ @X_EXTRA_LIBS@ +AM_CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @GFXFLAGS@ all: all-recursive .SUFFIXES: @@ -260,12 +261,12 @@ clean-mexecbinPROGRAMS: -test -z "$(mexecbin_PROGRAMS)" || rm -f $(mexecbin_PROGRAMS) -mount.app$(EXEEXT): $(mount_app_OBJECTS) $(mount_app_DEPENDENCIES) - @rm -f mount.app$(EXEEXT) - $(LINK) $(mount_app_LDFLAGS) $(mount_app_OBJECTS) $(mount_app_LDADD) $(LIBS) -mount.conf$(EXEEXT): $(mount_conf_OBJECTS) $(mount_conf_DEPENDENCIES) - @rm -f mount.conf$(EXEEXT) - $(LINK) $(mount_conf_LDFLAGS) $(mount_conf_OBJECTS) $(mount_conf_LDADD) $(LIBS) +wmmnt$(EXEEXT): $(wmmnt_OBJECTS) $(wmmnt_DEPENDENCIES) + @rm -f wmmnt$(EXEEXT) + $(LINK) $(wmmnt_LDFLAGS) $(wmmnt_OBJECTS) $(wmmnt_LDADD) $(LIBS) +wmmnt.conf$(EXEEXT): $(wmmnt_conf_OBJECTS) $(wmmnt_conf_DEPENDENCIES) + @rm -f wmmnt.conf$(EXEEXT) + $(LINK) $(wmmnt_conf_LDFLAGS) $(wmmnt_conf_OBJECTS) $(wmmnt_conf_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) --- ./README.00 2002-12-06 16:13:54.000000000 +0100 +++ ./README 2007-02-18 19:25:44.000000000 +0100 @@ -1,4 +1,4 @@ -mount.app - WindowMaker dock app +wmmnt - WindowMaker dock app Copyright (C) 1998,2002 Steve Borho This software comes with ABSOLUTELY NO WARRANTY @@ -24,15 +24,15 @@ NOTE: ===== -I do _NOT_ recommend giving mount.app suid or sgid permissions. +I do _NOT_ recommend giving wmmnt suid or sgid permissions. -If you want to run mount.app without using Window Maker as your window -manager, you must use the "-n" command line paramater: mount.app -n +If you want to run wmmnt without using Window Maker as your window +manager, you must use the "-n" command line paramater: wmmnt -n USAGE: ====== -launch with mount.app +launch with wmmnt drag it to the dock, set it to be autolaunched, and enjoy. @@ -42,8 +42,8 @@ (Midnight Commander for example). Double click on the black background to launch the config app. -If you run mount.app as non-root, and none of your devices are marked as -user-mountable, then mount.app will display only the last mount point +If you run wmmnt as non-root, and none of your devices are marked as +user-mountable, then wmmnt will display only the last mount point listed in your /etc/fstab file. Read the documentation that came with your distribution about how to make devices user mountable. In general it involves adding the option "user" to the list of options in /etc/fstab. @@ -53,10 +53,10 @@ work. If you make any modifications on the "Icons" tab, you'll have to restart -mount.app for them to take effect. All other modifications should happen +wmmnt for them to take effect. All other modifications should happen automagically when you hit the "Make it so" button. -mount.app stores its configuration in ~/GNUstep/Defaults/mount.app but +wmmnt stores its configuration in ~/GNUstep/Defaults/wmmnt but you should never have to edit this file directly, unless you need to tweak something that is not yet configurable from the config app (like fonts and colors). @@ -69,16 +69,16 @@ MAKING NEW ICONS: ================= -You don't like mount.app's icons? Well then fire up the gimp and make +You don't like wmmnt's icons? Well then fire up the gimp and make some new ones. Just take one of the existing ones as a sample, modify it to hearts content, then save it to your icondir with the others. Fire up the config app and assign one of the "User defined" icon types to it (Or even override one of the default pixmaps) then assign that icon type to a mount point. That's it! -Unfortunately, because of the way mount.app initializes itself, it cannot +Unfortunately, because of the way wmmnt initializes itself, it cannot automatically load the new pixmap when the config app quits. You'll have -to kill the dock app and restart it. (The same is true of mount.app's +to kill the dock app and restart it. (The same is true of wmmnt's colors and fonts). And please, if you do make new icons, send them to me so they can be added --- ./configure.00 2007-02-18 16:14:09.000000000 +0100 +++ ./configure 2007-02-18 18:57:49.000000000 +0100 @@ -2061,7 +2061,7 @@ # Define the identity of the package. - PACKAGE=mountapp + PACKAGE=wmmnt VERSION=3.1 @@ -6664,7 +6664,7 @@ if test "$shape" = no; then echo "********** WARNING *************" - echo "You need X server shape extensions in order to run mount.app," + echo "You need X server shape extensions in order to run wmmnt," echo "and they were not found on your system." read foo fi @@ -7018,7 +7018,7 @@ if test "$missing" = yes; then echo "********** WARNING *************" echo "libWINGs is not installed in your system." - echo "You need to build it before building mount.app (if you already" + echo "You need to build it before building wmmnt (if you already" echo "did that, remove config.cache and rerun configure)." echo "Please read the INSTALL file for detailed instructions." read foo @@ -7041,7 +7041,7 @@ fi mountsdir='${bindir}' -pixmapdir='${datadir}/mount.app' +pixmapdir='${datadir}/wmmnt' @@ -7060,9 +7060,9 @@ if test "${datadir}" = '${prefix}/share'; then - ICONDIR=${prefix}/share/mount.app + ICONDIR=${prefix}/share/wmmnt else - ICONDIR=${datadir}/mount.app + ICONDIR=${datadir}/wmmnt fi cat >>confdefs.h <<_ACEOF #define ICONDIR "$ICONDIR" --- ./AUTHORS.00 2000-05-01 20:02:43.000000000 +0200 +++ ./AUTHORS 2007-02-18 19:24:48.000000000 +0100 @@ -6,3 +6,5 @@ mount.app is based on the original work of wmmount by Sam Hawker , and still uses much of it's look and feel. + +included wmmnt patch from Hadess --- ./configure.in.00 2007-02-18 15:46:05.000000000 +0100 +++ ./configure.in 2007-02-18 18:53:06.000000000 +0100 @@ -5,7 +5,7 @@ AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(mountapp, 3.1) +AM_INIT_AUTOMAKE(wmmnt, 3.1) dnl Checks for host/os name dnl ======================= @@ -70,12 +70,12 @@ if test "$shape" = no; then echo "********** WARNING *************" - echo "You need X server shape extensions in order to run mount.app," + echo "You need X server shape extensions in order to run wmmnt," echo "and they were not found on your system." read foo fi -dnl XPM Support <- If you disable XPM, mount.app will not compile. +dnl XPM Support <- If you disable XPM, wmmnt will not compile. dnl =========== xpm=yes AC_ARG_ENABLE(xpm, @@ -102,7 +102,7 @@ if test "$missing" = yes; then echo "********** WARNING *************" echo "libWINGs is not installed in your system." - echo "You need to build it before building mount.app (if you already" + echo "You need to build it before building wmmnt (if you already" echo "did that, remove config.cache and rerun configure)." echo "Please read the INSTALL file for detailed instructions." read foo @@ -125,7 +125,7 @@ fi mountsdir='${bindir}' -pixmapdir='${datadir}/mount.app' +pixmapdir='${datadir}/wmmnt' AC_SUBST(mountsdir) AC_SUBST(pixmapdir) @@ -141,9 +141,9 @@ AC_DEFINE_UNQUOTED(BINDIR, "$BINDIR") if test "${datadir}" = '${prefix}/share'; then - ICONDIR=${prefix}/share/mount.app + ICONDIR=${prefix}/share/wmmnt else - ICONDIR=${datadir}/mount.app + ICONDIR=${datadir}/wmmnt fi AC_DEFINE_UNQUOTED(ICONDIR, "$ICONDIR") --- ./mountapp.spec.00 2007-02-18 15:46:05.000000000 +0100 +++ ./mountapp.spec 2007-02-18 19:23:49.000000000 +0100 @@ -1,7 +1,7 @@ # -# SPEC file for mount.app +# SPEC file for wmmnt # -%define ver 3.0 +%define ver 3.1 %define rel 1 %define _prefix /usr %define execprefix /usr/X11R6 @@ -25,6 +25,17 @@ %changelog +* Sun Feb 18 2007 Gilbert Ashley + +-Changed program name to wmmnt. Several patches were applied to the mount.app +sources to accomplish this. I started with mount.app-3.0 and applied the debian +patch, then applied a patch with changes from the author (3.0 to 3.1), a small +patch to fix the DocKApp CLASS. The I applied a patch from Hadess for wmmnt-2.5 +(Mon May 24 1999 Hadess ) which converts the display style +significantly and includes quite a few icon themes. +The I changed all the paths and config files to chaneg the name. It seemed best +to change the name to avoid any conflicts with already installed versions. + * Fri Dec 06 2002 Steve Borho -Included patches to allow mount.app to work with the latest Window @@ -65,4 +76,4 @@ %defattr(-,root,root) %{_prefix} -%doc TODO README INSTALL THANKS AUTHORS COPYING NEWS ChangeLog README.smb +%doc TODO README INSTALL THANKS AUTHORS COPYING NEWS ChangeLog README.smb WMMNT