Fix bugs, fix older cruft

diff --git a/debian/changelog b/debian/changelog
index f5552bd2fd9856cae985a133fb7de4b988615b25..4575cb63f7cd9669b6084fa4ce2107ad97b05a1f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+ctsim (4.5.6-1) unstable; urgency=low
+
+  * man/*.1: Fix warnings from lintian
+  * debian/control: switch to libfftw3-dev (closes:488286)
+  * debian/control: switch from xlibmesa-gl-dev to libgl1-mesa-dev
+  (closes:488287)
+  * debian/control: Add Homepage and Vcs-Git
+  * debian/control: update Standards-Version to 3.8.2
+  * compat: change to 7
+  * rules: change dh_clean -k to dh_prep for debhelper 7
+  
+ -- Kevin M. Rosenberg <kmr@debian.org>  Fri, 31 Jul 2009 15:16:57 -0600
+
 ctsim (4.5.5-1) unstable; urgency=low
 
   * Better cleaning in makefiles to fix double building (closes:442534)

diff --git a/debian/compat b/debian/compat
index b8626c4cff2849624fb67f87cd0ad72b163671ad..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7

diff --git a/debian/control b/debian/control
index 45efc44a89315a568b4075f6dbf3dd7dc0feaba0..5133293acaf36ccbba2d8d405881d0cb3272d2f2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,14 @@ Source: ctsim
 Section: science
 Priority: extra
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
-Build-Depends: debhelper (>= 4.0.0), wx2.4-headers, fftw3-dev, libreadline5-dev, xlibmesa-gl-dev, libglu1-xorg-dev, libwxgtk2.4-dev, ctn-dev, libpng12-dev, libglib1.2-dev, libgtk1.2-dev
-Standards-Version: 3.7.2.2
-
+Build-Depends: debhelper (>= 7.0.0), wx2.4-headers, libfftw3-dev, libreadline5-dev, libgl1-mesa-dev, libwxgtk2.4-dev, ctn-dev, libpng12-dev, libglib1.2-dev, libgtk1.2-dev
+Standards-Version: 3.8.2
+Homepage: http://www.ctsim.org
+Vcs-Git: git://git.b9.com/ctsim.git
+         
 Package: ctsim
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4-1, fftw3, xlibmesa-gl | libgl1, libpng12-0
+Depends: ${shlibs:Depends}, ctsim-help
 Recommends: ctsim-doc
 Conflicts: ctsim
 Description: Computed tomography simulator

diff --git a/debian/ctsim-doc.doc-base b/debian/ctsim-doc.doc-base
index 5969c250607f90cb3af6ba3a0d05fc237b902ae6..bfc8f32b30d1947fc2e8b7e0a7c8286a45b8ede7 100644 (file)
--- a/debian/ctsim-doc.doc-base
+++ b/debian/ctsim-doc.doc-base
@@ -3,7 +3,7 @@ Title: CTSim
 Author: Kevin M. Rosenberg
 Abstract: This manual describes the theory
  and use of CTSim - A Computed Tomography Simulator.
-Section: math
+Section: Science/Medicine
 
 Format: PDF
 Files: /usr/share/doc/ctsim-doc/ctsim.pdf.gz
@@ -11,5 +11,3 @@ Files: /usr/share/doc/ctsim-doc/ctsim.pdf.gz
 Format: HTML
 Index: /usr/share/doc/ctsim-doc/html/index.html
 Files: /usr/share/doc/ctsim-doc/html/*.html
-
-  

diff --git a/debian/rules b/debian/rules
index 411b28cc6acc3ce630475dcd3b9dbdcdb8e9bf4b..f3c8e882351b7418f58a7661b55783459e04e0ba 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ install: DH_OPTIONS=
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k
+       dh_prep
        dh_installdirs
        #
        dh_installdirs -p $(pkg-help) $(ctsim-shared)
@@ -119,8 +119,8 @@ binary-arch: build install
        dh_fixperms -a
        dh_installmenu -a
        dh_installdeb -a
-       dh_gencontrol -a
        dh_shlibdeps -a
+       dh_gencontrol -a
        dh_md5sums -a
        dh_builddeb -a