[freeimage] 15/18: Use the upstream dos2unix target in autoreconf.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/experimental
in repository freeimage.

commit 7b342becff156a8dd1425a8a5e59c0ee585dc637
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Nov 5 23:23:11 2015 +0000

    Use the upstream dos2unix target in autoreconf.
---
 debian/control | 2 +-
 debian/rules   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 343febd..3a175bc 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Section: libs
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
+               dos2unix,
                libjpeg-dev,
                libjxr-dev,
                libopenexr-dev,
@@ -15,7 +16,6 @@ Build-Depends: debhelper (>= 9),
                libtiff-dev,
                libwebp-dev,
                pkg-config,
-               tofrodos,
                zlib1g-dev
 Build-Depends-Indep: doxygen
 Standards-Version: 3.9.6
diff --git a/debian/rules b/debian/rules
index 7b91f20..61a46e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,10 +22,10 @@ INSTALL_LIBDIR = $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)
 	dh $@ --with=autoreconf --parallel
 
 gen-src-list:
-	fromdos gensrclist.sh
-	fromdos genfipsrclist.sh
 	sh gensrclist.sh
+	$(MAKE) -f Makefile.gnu dos2unix
 	sh genfipsrclist.sh
+	$(MAKE) -f Makefile.fip dos2unix
 
 override_dh_autoreconf:
 	dh_autoreconf $(MAKE) -- -f $(CURDIR)/debian/rules gen-src-list

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freeimage.git