[freeimage] 04/04: Simplify d/rules, .install.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository freeimage.

commit c8cc95b8916b18f8262927776ff467a9db780740
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Oct 26 19:00:21 2015 +0100

    Simplify d/rules, .install.
---
 debian/libfreeimage-dev.install | 9 ++++-----
 debian/libfreeimage3.install    | 8 ++++----
 debian/rules                    | 8 +++-----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/debian/libfreeimage-dev.install b/debian/libfreeimage-dev.install
index 0bb57a6..ee8bbd3 100644
--- a/debian/libfreeimage-dev.install
+++ b/debian/libfreeimage-dev.install
@@ -1,5 +1,4 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/libfreeimage.a
-debian/tmp/usr/lib/libfreeimage.so
-debian/tmp/usr/lib/libfreeimageplus.a
-debian/tmp/usr/lib/libfreeimageplus.so
+usr/include
+usr/lib/*.a
+usr/lib/libfreeimage.so
+usr/lib/libfreeimageplus.so
diff --git a/debian/libfreeimage3.install b/debian/libfreeimage3.install
index c35b120..2dbb155 100644
--- a/debian/libfreeimage3.install
+++ b/debian/libfreeimage3.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libfreeimage-*.so
-debian/tmp/usr/lib/libfreeimage.so.3
-debian/tmp/usr/lib/libfreeimageplus-*.so
-debian/tmp/usr/lib/libfreeimageplus.so.3
+usr/lib/libfreeimage-*.so
+usr/lib/*.so.*
+usr/lib/libfreeimageplus-*.so
+usr/lib/libfreeimageplus.so.*
diff --git a/debian/rules b/debian/rules
index 6690407..da202b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) -fPIC
 LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
 %:
-	dh $@ --with=autoreconf
+	dh $@ --with=autoreconf --parallel
 
 gen-src-list:
 	fromdos gensrclist.sh
@@ -22,13 +22,11 @@ override_dh_auto_build:
 	$(MAKE) -f Makefile.fip CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 override_dh_auto_install:
-	mkdir -p debian/tmp/usr/include
-	mkdir -p debian/tmp/usr/lib
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	dh_auto_install
 	$(MAKE) -f Makefile.fip install DESTDIR=$(CURDIR)/debian/tmp
 
 override_dh_auto_clean:
-	$(MAKE) clean
+	dh_auto_clean
 	$(MAKE) -f Makefile.fip clean
 
 override_dh_installdocs:

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