[med-svn] [gwyddion] 03/08: Move header file from /usr/lib to /usr/include

[Andreas Tille]

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

tille pushed a commit to branch master
in repository gwyddion.

commit d0f91ab826edc26d3bf2df38973c297d0b767ebd
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 21 11:45:41 2017 +0200

    Move header file from /usr/lib to /usr/include
---
 debian/changelog | 5 +----
 debian/rules     | 4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c144bb4..e2ade61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,10 +9,7 @@ gwyddion (2.49-1) UNRELEASED; urgency=medium
   * Remove Jan Beyer from uploaders list
     Closes: #871603
   * Move packaging from SVN to Git
-  TODO: /usr/lib/x86_64-linux-gnu/gwyddion/include in package
-        libgwyddion20-dev should most probably go to /usr/include
-        rather than /usr/lib
-  * 
+  * Move header file from /usr/lib to /usr/include
 
  -- Andreas Tille <tille at debian.org>  Thu, 24 Nov 2016 22:08:19 +0100
 
diff --git a/debian/rules b/debian/rules
index 1b526ea..8cd58d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,8 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
 #DEB_CONFIGURE_EXTRA_FLAGS := --libexecdir=\$${libdir} CFLAGS= "-Wall -g" --disable-rpath
 DEB_CONFIGURE_EXTRA_FLAGS := --libexecdir=\$${libdir} --disable-rpath
 
+include /usr/share/dpkg/default.mk
+
 %:
 	dh $@  
 
@@ -19,6 +21,8 @@ override_dh_install:
 	dh_install
 	find debian -name "*.la" -o -name "*.pyc" -o -name "*.pyo" | xargs -r rm -f
 	chrpath -d debian/tmp/usr/bin/gwyddion*
+	mv debian/libgwyddion20-dev/usr/lib/*/$(DEB_SOURCE)/include/* debian/libgwyddion20-dev/usr/include/$(DEB_SOURCE)
+	rm -rf debian/libgwyddion20-dev/usr/lib/*/$(DEB_SOURCE)
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gwyddion.git