r10874: ctsim (4.4.2-2) unstable; urgency=low

  * Allow runtime depends on libgl1 (closes: 348738)
  * Fix linogram symlink (closes: 346549)

diff --git a/debian/changelog b/debian/changelog
index ffa9560dd5fedac84cd7015422e13e7f735590a7..9fde9ec98708b60fea7398db9ed012db300e4ba0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ctsim (4.4.2-2) unstable; urgency=low
+
+  * Allow runtime depends on libgl1 (closes: 348738)
+  * Fix linogram symlink (closes: 346549)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 18 Jan 2006 12:07:02 -0700
+
 ctsim (4.4.2-1) unstable; urgency=low
 
   * New upstream URI in documentation

diff --git a/debian/control b/debian/control
index 10e33547419613c8a9e9f223860cd112302a96c4..f422915250051d0aef1de49c05d08056da8e1752 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.6.2.1
 
 Package: ctsim
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4-1, fftw3, xlibmesa-gl, libpng12-0
+Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4-1, fftw3, xlibmesa-gl | libgl1, libpng12-0
 Recommends: ctsim-doc
 Replaces: ctsim
 Conflicts: ctsim
@@ -25,7 +25,7 @@ Description: Computed tomography simulator
 
 Package: ctsim-pentium4
 Architecture: i386 kfreebsd-i386
-Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4-1, fftw3, xlibmesa-gl, libpng12-0
+Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4-1, fftw3, xlibmesa-gl | libgl1, libpng12-0
 Recommends: ctsim-doc
 Provides: ctsim
 Replaces: ctsim
@@ -45,7 +45,7 @@ Description: Computed tomograpy simulator (Pentium 4 optimized)
 
 Package: ctsim-athlon
 Architecture: i386 kfreebsd-i386
-Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4-1, fftw3, xlibmesa-gl, libpng12-0
+Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4-1, fftw3, xlibmesa-gl | libgl1, libpng12-0
 Recommends: ctsim-doc
 Provides: ctsim
 Replaces: ctsim

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 871e23750765bfaa9ffb3848a52c3eaba798ec09..510bc551148626f86c861f1d963f56c4f8dd8fc0 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -20,7 +20,7 @@ install-exec-hook:
        ln -sf ctsimtext $(bindir)/pjinfo
        ln -sf ctsimtext $(bindir)/pjrec
        ln -sf ctsimtext $(bindir)/pjHinterp
-       ln -sf linogram $(bindir)/linogram
+       ln -sf ctsimtext $(bindir)/linogram
 
 ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp nographics.cpp phm2helix.cpp pjHinterp.cpp linogram.cpp
 ctsimtext_LDADD=@ctlibs@