1.1 --- a/debian/changelog	Fri Nov 23 23:04:36 2007 +0100
     1.2 +++ b/debian/changelog	Sat Nov 24 23:29:16 2007 +0100
     1.3 @@ -1,3 +1,11 @@
     1.4 +genwebgallery (0.4-2) unstable; urgency=low
     1.5 +
     1.6 +  * fixed hyphen-minus-conflict in man page
     1.7 +  * refactored debian/rules (deleted a lot)
     1.8 +
     1.9 + -- markus schnalke <meillo@marmaro.de>  Sat, 24 Nov 2007 23:10:34 +0100
    1.10 +
    1.11 +
    1.12  genwebgallery (0.4-1) unstable; urgency=low
    1.13  
    1.14    * new upstream version

     2.1 --- a/debian/rules	Fri Nov 23 23:04:36 2007 +0100
     2.2 +++ b/debian/rules	Sat Nov 24 23:29:16 2007 +0100
     2.3 @@ -10,46 +10,14 @@
     2.4  #export DH_VERBOSE=1
     2.5  
     2.6  
     2.7 -
     2.8 -
     2.9 -CFLAGS = -Wall -g
    2.10 -
    2.11 -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
    2.12 -	CFLAGS += -O0
    2.13 -else
    2.14 -	CFLAGS += -O2
    2.15 -endif
    2.16 -
    2.17 -configure: configure-stamp
    2.18 -configure-stamp:
    2.19 -	dh_testdir
    2.20 -	# Add here commands to configure the package.
    2.21 -
    2.22 -	touch configure-stamp
    2.23 -
    2.24 -
    2.25 -build: build-stamp
    2.26 -
    2.27 -build-stamp: configure-stamp 
    2.28 -	dh_testdir
    2.29 -
    2.30 -	# Add here commands to compile the package.
    2.31 -	$(MAKE)
    2.32 -	#docbook-to-man debian/genwebgallery.sgml > genwebgallery.1
    2.33 -
    2.34 -	touch $@
    2.35 +build:
    2.36  
    2.37  clean:
    2.38  	dh_testdir
    2.39  	dh_testroot
    2.40 -	rm -f build-stamp configure-stamp
    2.41 -
    2.42 -	# Add here commands to clean up after the build process.
    2.43 -	-$(MAKE) clean
    2.44 -
    2.45  	dh_clean 
    2.46  
    2.47 -install: build
    2.48 +install:
    2.49  	dh_testdir
    2.50  	dh_testroot
    2.51  	dh_clean -k 
    2.52 @@ -60,39 +28,33 @@
    2.53  
    2.54  
    2.55  # Build architecture-independent files here.
    2.56 -binary-indep: build install
    2.57 +binary-indep: install
    2.58  	dh_testdir
    2.59  	dh_testroot
    2.60  	dh_installchangelogs ChangeLog
    2.61  	dh_installdocs
    2.62 -	dh_installexamples
    2.63 +# dh_installexamples
    2.64  #	dh_install
    2.65  #	dh_installmenu
    2.66  #	dh_installdebconf	
    2.67 -#	dh_installlogrotate
    2.68 -#	dh_installemacsen
    2.69 -#	dh_installpam
    2.70  #	dh_installmime
    2.71 -#	dh_python
    2.72  #	dh_installinit
    2.73 -#	dh_installcron
    2.74 -#	dh_installinfo
    2.75  	dh_installman
    2.76 -	dh_link
    2.77 -	dh_strip
    2.78 +# dh_link
    2.79 +# dh_strip
    2.80  	dh_compress
    2.81  	dh_fixperms
    2.82  #	dh_perl
    2.83  #	dh_makeshlibs
    2.84  	dh_installdeb
    2.85 -	dh_shlibdeps
    2.86 +# dh_shlibdeps
    2.87  	dh_gencontrol
    2.88  	dh_md5sums
    2.89  	dh_builddeb
    2.90  
    2.91  # Build architecture-dependent files here.
    2.92 -binary-arch: build install
    2.93 -# We have nothing to do by default.
    2.94 +binary-arch:
    2.95  
    2.96 -binary: binary-indep binary-arch
    2.97 +binary: binary-indep
    2.98 +
    2.99  .PHONY: build clean binary-indep binary-arch binary install configure

     3.1 --- a/genwebgallery.1	Fri Nov 23 23:04:36 2007 +0100
     3.2 +++ b/genwebgallery.1	Sat Nov 24 23:29:16 2007 +0100
     3.3 @@ -1,4 +1,4 @@
     3.4 -.TH GENWEBGALLERY 1 "genwebgallery-VERSION" "2007-11-21" "genwebgallery"
     3.5 +.TH GENWEBGALLERY 1 "genwebgallery\-VERSION" "2007\-11\-21" "genwebgallery"
     3.6  
     3.7  .SH NAME
     3.8  genwebgallery
     3.9 @@ -10,7 +10,7 @@
    3.10  .B genwebgallery
    3.11  Generates a web gallery of mentioned pictures. Only very minimalistic static HTML pages are generated. Copies of the pictures get resized to the defined sizes.
    3.12  .PP
    3.13 -All generated content goes in a subdirectory which defaults to 'webgallery'. Or any other directory specified by --output.
    3.14 +All generated content goes in a subdirectory which defaults to 'webgallery'. Or any other directory specified by \-\-output.
    3.15  .PP
    3.16  The
    3.17  .BR convert
    3.18 @@ -39,10 +39,10 @@
    3.19  .B \-c, \-\-copyright
    3.20  Specify copyright notice
    3.21  .TP
    3.22 -.B \-ps, \-\-pic-size
    3.23 +.B \-ps, \-\-pic\-size
    3.24  Specify size of picture
    3.25  .TP
    3.26 -.B \-ts, \-\-thumb-size
    3.27 +.B \-ts, \-\-thumb\-size
    3.28  Specify size of thumbnails
    3.29  .TP
    3.30  .B \-\-overwrite
    3.31 @@ -50,7 +50,7 @@
    3.32  Without this option, the users is interactively asked what to do.
    3.33  .PP
    3.34  See
    3.35 -.B genwebgallery --help
    3.36 +.B genwebgallery \-\-help
    3.37  for default values.
    3.38  
    3.39  .SH EXIT CODE