# HG changeset patch
# User meillo@marmaro.de
# Date 1208632837 -7200
# Node ID 326bcd4e1708c6dacc8bfa26b2466d88a89891d7
# Parent  6273a788c4fd861718bdb532dcc66aff487401f1
$PROGRAM instead of basename $0; printf instead of echo -n; command -v to test for installed convert

diff -r 6273a788c4fd -r 326bcd4e1708 COPYRIGHT
--- a/COPYRIGHT	Sat Apr 19 11:38:29 2008 +0200
+++ b/COPYRIGHT	Sat Apr 19 21:20:37 2008 +0200
@@ -1,6 +1,6 @@
 License: MIT License
 
-Copyright: 2007 by markus schnalke
+Copyright: 2007, 2008 by markus schnalke
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff -r 6273a788c4fd -r 326bcd4e1708 Makefile
--- a/Makefile	Sat Apr 19 11:38:29 2008 +0200
+++ b/Makefile	Sat Apr 19 21:20:37 2008 +0200
@@ -2,12 +2,12 @@
 
 
 NAME=genwebgallery
-VERSION = 0.4
+VERSION = 0.5
 NV=${NAME}-${VERSION}
 
 DOCS=COPYRIGHT ChangeLog TODO
- 
-# paths 
+
+# paths
 PREFIX = /usr
 BINDIR = ${PREFIX}/bin
 MANDIR = ${PREFIX}/share/man
diff -r 6273a788c4fd -r 326bcd4e1708 debian/control
--- a/debian/control	Sat Apr 19 11:38:29 2008 +0200
+++ b/debian/control	Sat Apr 19 21:20:37 2008 +0200
@@ -8,9 +8,17 @@
 Package: genwebgallery
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, imagemagick
-Description: generates a web gallery with static html
+Description: generates a minimalistic web gallery
  *** unofficial package from meillo@marmaro.de ***
  .
- Very simple tool to generate static html pages to view pictures on the web.
+ Very simple tool to generate static HTML pages to view
+ pictures on the web.
+ The generated pages are not very beautiful, but simple.
+ They contain just what is really needed - no fancy stuff.
+ Also the generation process is only one program call. You
+ can specify some configuration options like the dimension
+ of the created thumbnails, the name of the index page and
+ some more.
+ All image processing is done via ImageMagick.
  .
  Homepage: http://prog.marmaro.de
diff -r 6273a788c4fd -r 326bcd4e1708 debian/copyright
--- a/debian/copyright	Sat Apr 19 11:38:29 2008 +0200
+++ b/debian/copyright	Sat Apr 19 21:20:37 2008 +0200
@@ -5,7 +5,7 @@
 
 Upstream Author: markus schnalke <meillo@marmaro.de>
 
-Copyright: 2007 by markus schnalke
+Copyright: 2007, 2008 by markus schnalke
 
 License: MIT License
 
diff -r 6273a788c4fd -r 326bcd4e1708 genwebgallery
--- a/genwebgallery	Sat Apr 19 11:38:29 2008 +0200
+++ b/genwebgallery	Sat Apr 19 21:20:37 2008 +0200
@@ -7,7 +7,8 @@
 #
 
 
-VERSION=0.4
+PROGRAM=genwebgallery
+VERSION=0.5
 
 verbose="no"
 targetDir="webgallery"
@@ -26,7 +27,7 @@
 	if [ -e "$targetDir" ] ; then
 		if [ "$overwrite" = "no" ] ; then
 			echo "output directory '$targetDir' already exists."
-			echo -n "remove it? [y/n] "
+			printf "remove it? [y/n] "
 			read remove
 		fi
 
@@ -88,8 +89,7 @@
 
 checkConvert() {
 	log "checking convert installation"
-	(convert -version) 2> /dev/null > /dev/null
-	if [ $? -ne 0 ] ; then
+	if [ ! `command -v convert` ] ; then
 		echo "Can not find 'convert' (package imagemagick)"
 		echo "ABORT"
 		exit 2
@@ -101,18 +101,18 @@
 
 
 usage() {
-	echo "usage: `basename $0` [OPTIONS] FILES"
+	echo "usage: $PROGRAM [OPTIONS] FILES"
 	exit 1
 }
 
 
 
 help() {
-	echo "`basename $0`
+	echo "$PROGRAM
 
 generates a web gallery consisting of html pages
 
-usage: `basename $0` [OPTIONS] PICTURES
+usage: $PROGRAM [OPTIONS] PICTURES
 
 options:
 	--version   print program version
@@ -122,11 +122,11 @@
 	-i FILE     the name of the index file ($index)
 	-t TEXT     title of the gallery ($galleryTitle)
 	-c TEXT     a copyright notice ($copyright)
-	-ps PIXELS  size of the pics ($sizePic)
+	-ps PIXELS  size of the pictures ($sizePic)
 	-ts PIXELS  size of the thumbnails ($sizeThumb)
 	--overwrite overwrite output directory ($overwrite)
 
-for more information see man page: genwebgallery(1)
+for more information see man page: $PROGRAM(1)
 
 author: meillo@marmaro.de
 homepage: http://prog.marmaro.de
@@ -142,7 +142,7 @@
 while [  "$#" -ge 1  -a  `echo "$1" | awk '{print substr($0,1,1)}'` = '-'  ] ; do
 	case $1 in
 		'--version')
-			echo "genwebgallery version $VERSION"
+			echo "$PROGRAM version $VERSION"
 			exit 0
 			;;
 		'--help')
@@ -188,7 +188,7 @@
 			;;
 		*)
 			echo "invalid option: $1"
-			echo "see: `basename $0` --help"
+			echo "see: $PROGRAM --help"
 			exit 1
 	esac