--- mountapp-3.0.orig/src/mount.c +++ mountapp-3.0/src/mount.c @@ -101,6 +101,12 @@ aiPtr->curMount = i; break; } + if (aiPtr->numMounts == 0) + { + fprintf(stderr, "No mountpoints defined on fstab, or fstab not found.\n" + "Cannot continue.\n"); + exit(-1); + } if (i >= aiPtr->numMounts) { fprintf(stderr, --- mountapp-3.0.orig/src/globals.c +++ mountapp-3.0/src/globals.c @@ -26,7 +26,7 @@ char mountcmd[STR] = ""; char umountcmd[STR] = ""; char ejectcmd[STR] = ""; -char opencmd[STR] = "xterm -e mc %s &"; +char opencmd[STR] = "x-terminal-emulator -e mc %s &"; char txtfont[STR] = "-*-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*"; char txtcolor[STR] = "gray90"; char capfont[STR] = "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*"; --- mountapp-3.0.orig/configure +++ mountapp-3.0/configure @@ -5066,184 +5066,6 @@ GFXLIBS="$GFXLIBS -lz" fi - echo "$as_me:$LINENO: checking for jpeg_destroy_compress in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_destroy_compress in -ljpeg... $ECHO_C" >&6 -if test "${ac_cv_lib_jpeg_jpeg_destroy_compress+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ljpeg $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char jpeg_destroy_compress (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -jpeg_destroy_compress (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_jpeg_jpeg_destroy_compress=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_jpeg_jpeg_destroy_compress=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6 -if test $ac_cv_lib_jpeg_jpeg_destroy_compress = yes; then - GFXLIBS="-ljpeg $GFXLIBS" -fi - - echo "$as_me:$LINENO: checking for TIFFGetVersion in -ltiff" >&5 -echo $ECHO_N "checking for TIFFGetVersion in -ltiff... $ECHO_C" >&6 -if test "${ac_cv_lib_tiff_TIFFGetVersion+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltiff $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char TIFFGetVersion (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -TIFFGetVersion (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_tiff_TIFFGetVersion=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_tiff_TIFFGetVersion=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5 -echo "${ECHO_T}$ac_cv_lib_tiff_TIFFGetVersion" >&6 -if test $ac_cv_lib_tiff_TIFFGetVersion = yes; then - GFXLIBS="-ltiff $GFXLIBS" -else - echo "$as_me:$LINENO: checking for TIFFGetVersion in -ltiff34" >&5 -echo $ECHO_N "checking for TIFFGetVersion in -ltiff34... $ECHO_C" >&6 -if test "${ac_cv_lib_tiff34_TIFFGetVersion+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltiff34 $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char TIFFGetVersion (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -TIFFGetVersion (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_tiff34_TIFFGetVersion=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_tiff34_TIFFGetVersion=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFGetVersion" >&5 -echo "${ECHO_T}$ac_cv_lib_tiff34_TIFFGetVersion" >&6 -if test $ac_cv_lib_tiff34_TIFFGetVersion = yes; then - GFXLIBS="-ltiff34 $GFXLIBS" -fi - -fi - fi --- mountapp-3.0.orig/configure.in +++ mountapp-3.0/configure.in @@ -89,12 +89,6 @@ AC_CHECK_LIB(m, cos) AC_CHECK_LIB(z, gzread,GFXLIBS="$GFXLIBS -lz",, $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS) - AC_CHECK_LIB(jpeg, jpeg_destroy_compress, GFXLIBS="-ljpeg $GFXLIBS",, - $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS) - AC_CHECK_LIB(tiff, TIFFGetVersion, GFXLIBS="-ltiff $GFXLIBS", - AC_CHECK_LIB(tiff34, TIFFGetVersion, GFXLIBS="-ltiff34 $GFXLIBS",, - $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS), - $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS) fi dnl ===================================================== --- mountapp-3.0.orig/debian/docs +++ mountapp-3.0/debian/docs @@ -0,0 +1 @@ +AUTHORS NEWS README TODO THANKS --- mountapp-3.0.orig/debian/changelog +++ mountapp-3.0/debian/changelog @@ -0,0 +1,135 @@ +mountapp (3.0-9) unstable; urgency=low + + * Added missing build-dependency on libxt-dev (Closes:#346261) + + -- Gunnar Wolf Fri, 6 Jan 2006 14:11:24 -0600 + +mountapp (3.0-8) unstable; urgency=low + + * Substituted build-dependency on the old xlibs-dev package for its + libx11-dev, libxext-dev, libxpm-dev, x-dev components + * Updated standards-version to 3.6.2 + * No longer segfaults when no mount points are defined in fstab or + when no fstab is found (Closes: #333493) + + -- Gunnar Wolf Wed, 4 Jan 2006 14:35:28 -0600 + +mountapp (3.0-7) unstable; urgency=low + + * Acknowledge Andreas Metzler's NMU - Thanks! (Closes: #264354, #262822) + * In order to keep config.{guess,sub} up to date, added a dependency + on autotools-dev, and link them from /usr/share/misc at configure + time. + + -- Gunnar Wolf Sat, 28 Aug 2004 10:25:41 -0500 + +mountapp (3.0-6.1) unstable; urgency=medium + + * NMU, necessary for libtiff4 transition. + * Change configure/configure.in to stop mountapp from linking against + libtiff. It is is a useless dependency, mount.app does not use any TIFF* + function and "tiff support" is explicitely listed in TODO. (Closes: + #262822) + * Do the same for libjpeg62. wmmount does not use any functioniality + provided by it. I really have no idea why the author chooses to link + against it. + * Update config.guess config.sub. + + -- Andreas Metzler Sun, 8 Aug 2004 11:26:34 +0200 + +mountapp (3.0-6) unstable; urgency=low + + * Added build-dependency on xlibs-dev, zlib1g-dev (Closes: #258160) + * Added dependency on eject and xbase-clients, as instructed by + INSTALL (can't understand how no one had brought this to my + attention sooner ;-) ) + * Fixed two unquoted strings in debian/menu, fixing lintian warnings + + -- Gunnar Wolf Wed, 7 Jul 2004 20:28:20 -0500 + +mountapp (3.0-5) unstable; urgency=low + + * Bumped up standards-version to 3.6.1 + * Clarified description so it will not misguide the user to think this + is a WindowMaker-only program (Closes: #218198) + + -- Gunnar Wolf Sun, 2 Nov 2003 23:25:09 -0600 + +mountapp (3.0-4) unstable; urgency=low + + * Fixed some minor lintian issues + * Created the manpages for mount.app and mount.conf + * Removed irrelevant/obsolete documentation files (INSTALL, + README.smb) + * Moved binaries from /usr/X11R6/bin/ to /usr/bin/ (Only packages that + are part of X itself should actually install binaries into + /usr/X11R6/bin) + * Moved standards-version to 3.6.0 + + -- Gunnar Wolf Fri, 1 Aug 2003 21:27:48 -0500 + +mountapp (3.0-3) unstable; urgency=low + + * New maintainer (Closes: #203507) + + -- Gunnar Wolf Fri, 1 Aug 2003 12:32:27 -0500 + +mountapp (3.0-2.1) unstable; urgency=low + + * NMU + * Really do update config.{sub,guess} (Closes: #172500. Again.) + + -- Andrew Suffield Fri, 11 Apr 2003 20:55:15 +0100 + +mountapp (3.0-2) unstable; urgency=low + + * Added newer versions of config.guess/config.sub. + * (closes: #172500) + + -- Olaf Stetzer Thu, 30 Jan 2003 21:54:29 +0100 + +mountapp (3.0-1) unstable; urgency=low + + * New upstream release now linked against libwings from WM. + + -- Olaf Stetzer Mon, 9 Dec 2002 20:04:01 +0100 + +mountapp (2.7-3) unstable; urgency=low + + * Recompiled against new xlibs (closes bug: # 170217) + * Added Build-depends. + + -- Olaf Stetzer Thu, 28 Nov 2002 23:00:12 +0100 + +mountapp (2.7-2) unstable; urgency=low + + * Changed path definitions in debian/rules (closes bug: # 63838) + + -- Olaf Stetzer Wed, 10 May 2000 20:13:20 +0200 + +mountapp (2.7-1) unstable; urgency=low + + * New upstream version. + + -- Olaf Stetzer Thu, 09 Mar 2000 21:06:13 +0200 + +mountapp (2.6-1) unstable; urgency=low + + * New upstream version. + + -- Olaf Stetzer Thu, 29 Jul 1999 00:06:13 +0200 + +mountapp (2.5-2) unstable; urgency=low + + * Changed package description. (closes bug: #36331) + * Fixed a wrong path-definition. + + -- Olaf Stetzer Wed, 28 Apr 1999 22:29:37 +0200 + +mountapp (2.5-1) unstable; urgency=low + + * Initial Release. + + -- Olaf Stetzer Mon, 12 Apr 1999 21:21:53 +0200 + + --- mountapp-3.0.orig/debian/copyright +++ mountapp-3.0/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Olaf Stetzer stetzer@debian.org on +Mon, 12 Apr 1999 21:21:53 +0200. + +It was downloaded from http://mountapp.sourceforge.net + +Upstream Author: Steve Borho + +Copyright: + +Copyright (C) 1998 +This software comes with ABSOLUTELY NO WARRANTY +This software is free software, and you are welcome to redistribute it +under certain conditions +See the COPYING file for details. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + See /usr/share/common-licenses/GPL for further details. + --- mountapp-3.0.orig/debian/watch +++ mountapp-3.0/debian/watch @@ -0,0 +1,6 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# Site Directory Pattern Version Script +version=2 +opts=pasv ftp://ftp.sourceforge.net/pub/sourceforge/m/mo/mountapp/mountapp-(.*)\.tar\.gz debian uupdate --- mountapp-3.0.orig/debian/menu +++ mountapp-3.0/debian/menu @@ -0,0 +1,2 @@ +?package(mountapp):needs="X11" section="Apps/System"\ + title="Mountapp" command="/usr/bin/mount.app" --- mountapp-3.0.orig/debian/control +++ mountapp-3.0/debian/control @@ -0,0 +1,18 @@ +Source: mountapp +Section: x11 +Priority: optional +Maintainer: Gunnar Wolf +Standards-Version: 3.6.2 +Build-depends: debhelper (>>4.0.0), libgtk1.2-dev, libwings-dev, libx11-dev, libxext-dev, libxpm-dev, x-dev, libxt-dev, zlib1g-dev, autotools-dev + +Package: mountapp +Architecture: any +Depends: ${shlibs:Depends}, eject, xbase-clients +Recommends: mc +Description: Tool to (un)mount devices, dockable in WM-like window managers + A dock app which allows you to browse all your mount points and to + mount/unmount devices in a simple point and click manner. + . + It was designed to match WindowMaker's look-and-feel - mountapp can + be run on any window manager, but it will look best in WindowMaker. + --- mountapp-3.0.orig/debian/rules +++ mountapp-3.0/debian/rules @@ -0,0 +1,88 @@ +#!/usr/bin/make -f +# Made with the aid of dh_make, by Craig Small +# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. +# Some lines taken from debmake, by Cristoph Lameter. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DH_COMPAT=4 + +dest_dir=$(CURDIR)/debian/mountapp + +build: build-stamp +build-stamp: + dh_testdir + + ln -s /usr/share/misc/config.{guess,sub} . + ./configure --prefix=/usr + # Add here commands to compile the package. + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp install-stamp + # Keep auto* from regenerating everything. - You could add + # AM_MAINTAINER_MODE to configure.in instead and run auto* once when + # generating the diff.gz. + touch configure.in && \ + sleep 1 && touch aclocal.m4 config.h.in && sleep 1 && \ + find -name Makefile.in -print0 | xargs -0r touch && \ + sleep 1 && touch configure + + # Add here commands to clean up after the build process. + [ ! -e Makefile ] || $(MAKE) distclean + + # config.guess and config.sub are just symlinks to the updated files at + # /usr/share/misc/ - Delete them, they will be created at configure + # time. + rm -f config.{guess,sub} + + dh_clean + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into $(dest_dir). + $(MAKE) install bindir=$(dest_dir)/usr/bin prefix=$(dest_dir)/usr + + touch install-stamp + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installmenu + dh_installman mount.app.1 mount.conf.1 + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary + + + + --- mountapp-3.0.orig/mount.app.1 +++ mountapp-3.0/mount.app.1 @@ -0,0 +1,73 @@ +.TH MOUNT.APP 1 "August 1 2003" +.SH NAME + mount.app - The WindowMaker universal mount point +.SH SYNOPSIS +.br + mount.app [options] [-display ] +.SH OPTIONS +.br + -h, -help prints help + -i Ignore NFS mounts + -n Window manager is other than WindowMaker + -display disp Select target display (see X manual pages) +.SH DESCRIPTION +.B mount.app +gives you a WindowMaker dockable applet from which you can +mount/unmount your different devices with a simple point-and-click +interface, as well as usage statistics for the currently mounted +devices. +.PP +Once you launch it, drag it to the dock, set it to be autolaunched, +and enjoy. +.PP +press the "<" and ">" arrow buttons to select a device / mount point. +press the mount button (the one with a bolt symbol) to mount or unmount. +Double-click on the drive icon to open a program at the mount point +(Midnight Commander for example). Double click on the black background +to launch the config app. +.PP +Clicking on the bar to the left of the arrows (which is black when +unmounted, green when mounted and yellow while mounting) makes +mount.app mount or unmount the device. +.PP +Double-clicking on the device's icon opens a program to browse its +contents (in the default configuration, an instance of Midnight +Commander in a terminal window). +.PP +Double-clicking on the background area runs mount.conf, mount.app's +configuration manager. +.PP +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 +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. +(the mount(8) and fstab(5) man pages are good reading as well) +.PP +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 +automagically when you hit the "Make it so" button. +.PP +mount.app stores its configuration in ~/GNUstep/Defaults/mount.app 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). +.SH MAKING NEW ICONS +You don't like mount.app'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! +.PP +Unfortunately, because of the way mount.app 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 +colors and fonts). +.SH SEE ALSO +.BR +mount.conf (1) +.SH AUTHOR +Steve Borho (borho@stlnet.com) +.SH WEBSITE +http://mountapp.sourceforge.net --- mountapp-3.0.orig/mount.conf.1 +++ mountapp-3.0/mount.conf.1 @@ -0,0 +1,38 @@ +.TH MOUNT.CONF 1 "August 1 2003" +.SH NAME + mount.conf - Configurator for mount.app +.SH SYNOPSIS +.br + mount.app [options] +.SH OPTIONS +.br + -h, -help Print a usage summary + -H Display FAQ window + -i Ignore NFS mounts + -s SIGHUP parent when saving + -m Specify initial mount point +.SH DESCRIPTION +.B mount.conf +lets you easily configure some aspects of the usage of mount.app. +You can either call it directly from the command line, or by +double-clicking on the background area of mount.app +.PP +It displays four tabs - +.B Mounts, +from which you can control which mountpoints to display or to ignore, +as well some display options for it, +.B Commands, +which allows you to specify which commands to use for mounting, +unmounting, ejecting and browsing (in case you do not want to use the +defaults), +.B Icons, +where you can specify which icons to use for the different disks, and +.B Extras, +with various behaviour configuration options. +.SH SEE ALSO +.BR +mount.app (1) +.SH AUTHOR +Steve Borho (borho@stlnet.com) +.SH WEBSITE +http://mountapp.sourceforge.net