debian/control: Change Build-Depends to libpng-dev from libpng12-dev

diff --git a/debian/changelog b/debian/changelog
index bdd2b68d27e339d2ee7881bccad4d95dfb493d86..749f48acc372806610a4716f29216c6ac48d35e1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+ctsim (5.2.0-1.2) unstable; urgency=low
+
+  * debian/control: Change Build-Depends to libpng-dev from libpng12-dev
+  (closes:662293)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Fri, 21 Dec 2012 14:31:30 -0700
+
+ctsim (5.2.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: /bin/sh: 0: Can't open ./config.status"
+    - as a pre-requisite, use autotools-dev to handle config.{sub,guess}
+      (newer dpkg-source bails out due the changed files); also remove
+      auto-generated patch with changes to these files
+    - for the actual fix, remove second call to make clean from debian/rules
+    (Closes: #642709)
+
+ -- gregor herrmann <gregoa@debian.org>  Thu, 15 Dec 2011 19:48:51 +0100
+
 ctsim (5.2.0-1) unstable; urgency=low
 
   * New upstream

diff --git a/debian/control b/debian/control
index 8e33b8ca0e0b1427d5cafd41c6498b6230dd6b6a..a8d3c69a2b9058f87c22aa7576cf9c2049e51a7a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ctsim
 Section: science
 Priority: extra
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
-Build-Depends: debhelper (>= 7.0.0), wx2.8-headers, libfftw3-dev, libreadline-dev, libgl1-mesa-dev, libglu1-mesa-dev, libwxgtk2.8-dev, ctn-dev, libpng12-dev, libglib2.0-dev, libgtk2.0-dev
+Build-Depends: debhelper (>= 7.0.0), wx2.8-headers, libfftw3-dev, libreadline-dev, libgl1-mesa-dev, libglu1-mesa-dev, libwxgtk2.8-dev, ctn-dev, libpng-dev, libglib2.0-dev, libgtk2.0-dev, autotools-dev
 Standards-Version: 3.9.1.0
 Homepage: http://www.ctsim.org
 Vcs-Git: git://git.b9.com/ctsim.git

diff --git a/debian/rules b/debian/rules
index 42f8109b3fd04780a0534fc7e9307054be915452..827e148cb6e5f7c82616f088b76ce561d0c03fea 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,7 @@ desktop-dir   := usr/share/applications
 configure: configure-stamp
 configure-stamp:
        dh_testdir
+       dh_autotools-dev_updateconfig
        ./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(HELPDIR) --with-ctn -with-x --without-lam
        touch configure-stamp
 
@@ -53,11 +54,8 @@ clean:
        if [ -f Makefile -a -f config.status ]; then $(MAKE) clean; fi
        find . -type f -and -name \*~ -or -name .\*~ -exec rm -f {} \;
        rm -f debian/ctsim.postinst.* debian/ctsim.prerm.*
-       # Ensure up-to-date versions of config.sub and config.guess
-       -test -r /usr/share/misc/config.sub && cp -f /usr/share/misc/config.sub config.sub
-       -test -r /usr/share/misc/config.guess && cp -f /usr/share/misc/config.guess config.guess
+       dh_autotools-dev_restoreconfig
        -rm -f configure-stamp build-indep-stamp build-arch-stamp
-       -test -r Makefile && $(MAKE) clean
        dh_clean
 
 install: DH_OPTIONS=