lintian warning fixes

diff --git a/configure.ac b/configure.ac
index 0f16b7a94fb41ef0289be5bcdaf76cd979b2a651..92d9bb9db33cc0549a2a723881e293aea38e3492 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -289,7 +289,7 @@ AC_ARG_WITH(webdata-url, [  --with-webdata-url=PATH Set URL path of webdata],
 AC_ARG_WITH(html-dir, [  --with-html-dir=PATH    Set directory of html files], 
 [ html_%dir=$withval ; AC_SUBST(htmldir) ] )
 
 AC_ARG_WITH(html-dir, [  --with-html-dir=PATH    Set directory of html files], 
 [ html_%dir=$withval ; AC_SUBST(htmldir) ] )
 

-if test "x$cgibindir" = "x" -o "x$cgibinurl" = "x" ; then
+if test "x$cgibindir" != "x" -o "x$cgibinurl" != "x" ; then

   cgiprograms="ctsim.cgi ctsim.conf"
   AC_SUBST(cgiprograms)
 fi
   cgiprograms="ctsim.cgi ctsim.conf"
   AC_SUBST(cgiprograms)
 fi

diff --git a/debian/changelog b/debian/changelog
index aa8ab0c0d83f8619a419dbf0715dfd9dc08ffddd..ef309f3e93d24b9b06b5b4f452e6b60d57a28863 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ctsim (5.0.2-1) unstable; urgency=low
+
+  * Changes to man pages for lintian warnings
+  * debian/ctsim.desktop: Remove deprecated Encoding key
+  
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 02 Aug 2009 06:25:36 -0600
+

 ctsim (5.0.1-2) unstable; urgency=low
 
   * Minor changes to the package's descriptions.
 ctsim (5.0.1-2) unstable; urgency=low
 
   * Minor changes to the package's descriptions.

diff --git a/debian/control b/debian/control
index 51bdb215026b721eb69c89a2d5e1fa61908619ba..80095717da2da809aa20398da9055e64fb1186be 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: extra
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Build-Depends: debhelper (>= 7.0.0), wx2.8-headers, libfftw3-dev, libreadline5-dev, libgl1-mesa-dev, libglu1-mesa-dev, libwxgtk2.8-dev, ctn-dev, libpng12-dev, libglib2.0-dev, libgtk2.0-dev
 Priority: extra
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Build-Depends: debhelper (>= 7.0.0), wx2.8-headers, libfftw3-dev, libreadline5-dev, libgl1-mesa-dev, libglu1-mesa-dev, libwxgtk2.8-dev, ctn-dev, libpng12-dev, libglib2.0-dev, libgtk2.0-dev

-Standards-Version: 3.8.2
+Standards-Version: 3.8.2.0

 Homepage: http://www.ctsim.org
 Vcs-Git: git://git.b9.com/ctsim.git
          
 Homepage: http://www.ctsim.org
 Vcs-Git: git://git.b9.com/ctsim.git
          


@@ -26,7 +26,10 @@ Architecture: all
 Replaces: ctsim (<< 3.5.3)
 Description: Online help file for CTSim
  This package provides the online help file for the ctsim package.
 Replaces: ctsim (<< 3.5.3)
 Description: Online help file for CTSim
  This package provides the online help file for the ctsim package.

- CTSim is a graphical computed tomography simulator.
+ CTSim is a graphical computed tomography simulator. 
+ This help file
+ is included in a separate package so it will not have to be include
+ in the binary ctsim package for every architecture.  

 
 Package: ctsim-doc
 Section: doc
 
 Package: ctsim-doc
 Section: doc


@@ -35,4 +38,7 @@ Recommends: ctsim
 Description: Documentation for ctsim package
  This package provides HTML and PDF documentation files for the
  ctsim package. CTSim is a graphical computed tomography simulator.
 Description: Documentation for ctsim package
  This package provides HTML and PDF documentation files for the
  ctsim package. CTSim is a graphical computed tomography simulator.

+ This documentation file
+ is included in a separate package so it will not have to be include
+ in the binary ctsim package for every architecture.  

 
 

diff --git a/debian/ctsim.desktop b/debian/ctsim.desktop
index 24bd8fb4edca48248d9cb83ecfe396544e522c33..e55e387883414291e813938fe2448133f1c00673 100644 (file)
--- a/debian/ctsim.desktop
+++ b/debian/ctsim.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
 [Desktop Entry]
 Version=1.0

-Encoding=UTF-8

 Name=CTSim Computed Tomography Simulator
 GenericName=Computed Tomography Simulator
 Comment=Simulate the process of X-ray Computed Tomography
 Name=CTSim Computed Tomography Simulator
 GenericName=Computed Tomography Simulator
 Comment=Simulate the process of X-ray Computed Tomography

diff --git a/debian/rules b/debian/rules
index f462268329e0d7d99609e542363e130aa9fd4744..6388bc8f95e0039e265701b96a1672fb698a0867 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,8 @@ desktop-dir   := usr/share/applications
 configure: configure-stamp
 configure-stamp:
        dh_testdir
 configure: configure-stamp
 configure-stamp:
        dh_testdir

+       autoreconf

        touch configure.in && touch aclocal.m4 && touch configure
        touch configure.in && touch aclocal.m4 && touch configure

-

        ./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(HELPDIR) --with-ctn -with-x --without-lam
        touch configure-stamp
 
        ./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(HELPDIR) --with-ctn -with-x --without-lam
        touch configure-stamp
 

diff --git a/man/ifexport.1 b/man/ifexport.1
index b4907cedace4aee738b7ef8cb8091e02609fe852..5ee81acc99ebcb4b620bfb966635b0dc10da344e 100644 (file)
--- a/man/ifexport.1
+++ b/man/ifexport.1
@@ -29,9 +29,9 @@ Set automatic window mode (default is full)
 .It Fl Fl scaling Ar multiple
 Set scaling factor for output image (default is 1)
 .It Fl Fl min Ar minimum
 .It Fl Fl scaling Ar multiple
 Set scaling factor for output image (default is 1)
 .It Fl Fl min Ar minimum

-Set minimum intensity of window (overrides --auto)
+Set minimum intensity of window (overrides \-\-auto)

 .It Fl Fl max Ar maximum
 .It Fl Fl max Ar maximum

-Set maximum intensity of window (overrides --auto)
+Set maximum intensity of window (overrides \-\-auto)

 .It Fl Fl stats
 Print image statistics
 .It Fl Fl labels
 .It Fl Fl stats
 Print image statistics
 .It Fl Fl labels