short dh

4 files changed, 11 insertions, 64 deletions

diff --git a/debian/changelog b/debian/changelog
index c602b16..7c63cd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ sparskit (2.0.0-3) UNRELEASED; urgency=medium
   * Moved packaging from SVN to Git
   * cme fix dpkg-control
   * debhelper 11
+  * d/rules: short dh
   * Fix homepage
 
  -- Andreas Tille <tille@debian.org>  Mon, 29 Jan 2018 12:14:36 +0100
diff --git a/debian/libsparskit-dev.install b/debian/libsparskit-dev.install
new file mode 100644
index 0000000..e60284a
--- /dev/null
+++ b/debian/libsparskit-dev.install
@@ -0,0 +1,2 @@
+usr/lib/libskit.a
+shared/usr/lib/libskit.so          usr/lib/
diff --git a/debian/libsparskit2.0.install b/debian/libsparskit2.0.install
new file mode 100644
index 0000000..df97210
--- /dev/null
+++ b/debian/libsparskit2.0.install
@@ -0,0 +1 @@
+shared/usr/lib/libskit.so.*        usr/lib
diff --git a/debian/rules b/debian/rules
index a05761c..606791e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,12 +19,10 @@ CMAKE_FLAGS = -DCMAKE_INSTALL_PREFIX:PATH=/usr \
               -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
               -DCMAKE_SKIP_RPATH:BOOL=ON
 
+%:
+	dh $@
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
+override_dh_auto_configure:
 	if [ ! -d $(STATIC_BUILD_PATH) ]; then mkdir $(STATIC_BUILD_PATH); fi
 	cd $(STATIC_BUILD_PATH) \
             && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON
@@ -37,78 +35,23 @@ configure-stamp:
 	cd $(SHARED_BUILD_PATH) \
             && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_TESTING:BOOL=OFF
 
-	touch $@
-
-
-build: build-stamp
-build-stamp: configure-stamp  
-	dh_testdir
-
-	# Add here commands to compile the package.
-
+override_dh_auto_build:
         # build static libs
 	$(MAKE) $(JOBS) -C $(STATIC_BUILD_PATH)
 
         # build shared libs and binaries
 	$(MAKE) $(JOBS) -C $(SHARED_BUILD_PATH)
 
+override_dh_auto_test:
 	# run a test
 	./DEB_build_static/ITSOL/riters.ex
 
-#	$(MAKE)
-#	./dotests
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
+override_dh_clean:
 	rm -rf $(STATIC_BUILD_PATH)
 	rm -rf $(SHARED_BUILD_PATH)
-
-#	$(MAKE) clean
 #	- rm libskit.a
-
 	dh_clean 
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
+override_dh_auto_install:
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp        install -C $(STATIC_BUILD_PATH)
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp/shared install -C $(SHARED_BUILD_PATH)
-
-	dh_install -plibsparskit-dev     usr/lib/libskit.a                  usr/lib
-	dh_install -plibsparskit-dev     shared/usr/lib/libskit.so          usr/lib
-	dh_install -plibsparskit2.0      shared/usr/lib/libskit.so.*        usr/lib
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_lintian
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure