Advance up to installation of files to debian dirs

diff --git a/debian/libmgl-data.install b/debian/libmgl-data.install
index b3773b6c27fd4fb8559855a03c2ece311b058f28..f98f41bf2b15466f12c5ebdf59988ff47cdfe2cb 100644 (file)
--- a/debian/libmgl-data.install
+++ b/debian/libmgl-data.install
@@ -1 +1 @@
-debian/tmp/usr/local/share/mathgl
+debian/tmp/usr/share/mathgl

diff --git a/debian/libmgl-dev.install b/debian/libmgl-dev.install
index 4d184b5420ff3179f1490e3bc18a85ccec8a5490..5d583d8590e5efc1d4d4f6e298489e56c57c3460 100644 (file)
--- a/debian/libmgl-dev.install
+++ b/debian/libmgl-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/local/include/*
-debian/tmp/usr/local/lib/*.so
-debian/tmp/usr/local/lib/*.a
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/*.so
+debian/tmp/usr/lib/*.a

diff --git a/debian/libmgl-wnd6.install b/debian/libmgl-wnd6.install
index d3d865881296037d6ee29649431cef024a9bd77d..f9595a3bf84374f87c7e2b638c36722084d87c04 100644 (file)
--- a/debian/libmgl-wnd6.install
+++ b/debian/libmgl-wnd6.install
@@ -1 +1 @@
-debian/tmp/usr/local/lib/libmgl-wnd.so.*
\ No newline at end of file
+debian/tmp/usr/lib/libmgl-wnd.so.*
\ No newline at end of file

diff --git a/debian/libmgl6.install b/debian/libmgl6.install
index 6c4f5ba8a00a3d88c404a4c21ceec38b2b0b46f7..248a51b133bfb1761fe5565cbb35aeab74f73e47 100644 (file)
--- a/debian/libmgl6.install
+++ b/debian/libmgl6.install
@@ -1 +1 @@
-debian/tmp/usr/local/lib/libmgl.so.*
\ No newline at end of file
+debian/tmp/usr/lib/libmgl.so.*
\ No newline at end of file

diff --git a/debian/mathgl.install b/debian/mathgl.install
index ceea6f53eef61ba120a6843addda439d85189c8f..dba26b586c9ddaea0186fe58999c43080fc6b614 100644 (file)
--- a/debian/mathgl.install
+++ b/debian/mathgl.install
@@ -1 +1 @@
-debian/tmp/usr/local/bin/*
\ No newline at end of file
+debian/tmp/usr/bin/*
\ No newline at end of file

diff --git a/debian/python-mathgl.install b/debian/python-mathgl.install
index 08038b90d05cf751cdb1c74fdd3e41677bac66dc..18106cb6501abc937ee7f58ed4d1bf47f308be80 100644 (file)
--- a/debian/python-mathgl.install
+++ b/debian/python-mathgl.install
@@ -1 +1 @@
-debian/tmp/usr/local/lib/python*/dist-packages/*
+debian/tmp/usr/lib/python*/dist-packages/*

diff --git a/debian/rules b/debian/rules
index 79e59f3a4c7c0720e3dc6007f4e82ab0ca7506ee..db6281d3abc9f5e2fcd022b5570837029ad89384 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ build-stamp:
        dh_testdir
        dh_auto_configure --buildsystem=cmake
        dh_auto_build --buildsystem=cmake
-       dh_auto_test
+       dh_auto_test --buildsystem=cmake
 
 binary-indep:
        dh_testroot -i
@@ -32,10 +32,10 @@ binary-indep:
        dh_install -i
        dh_installdocs -i
        dh_installchangelogs -i
-#      dh_installexamples -i
-#      dh_installman -i
-#      dh_installcatalogs -i
-#      dh_installcron -i
+       dh_installexamples -i
+       dh_installman -i
+       dh_installcatalogs -i
+       dh_installcron -i
        dh_installdebconf -i
 #      dh_installemacsen -i
 #      dh_installifupdown -i
@@ -73,43 +73,43 @@ binary-arch:
        dh_testroot -a
        dh_prep -a
        dh_installdirs -a
-       dh_auto_install -a
-       rm -f debian/tmp/usr/bin/*_example
+       dh_auto_install -a --buildsystem=cmake
+#      rm -f debian/tmp/usr/bin/*_example
 #      for file in debian/tmp/usr/lib/*.la; do \
 #              sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
 #      done
-#      chrpath -d debian/tmp/usr/lib/*so.6
-#      chrpath -d debian/tmp/usr/lib/python*/dist-packages/_mathgl.so
+#      chrpath -d debian/tmp/usr/lib/*so.6
+#      chrpath -d debian/tmp/usr/lib/python*/dist-packages/_mathgl.so
        dh_install -a
        dh_installdocs -a
        dh_installchangelogs -a
-#      dh_installexamples -a
+       dh_installexamples -a
        dh_installman -a
-#      dh_installcatalogs -a
-#      dh_installcron -a
+       dh_installcatalogs -a
+       dh_installcron -a
        dh_installdebconf -a
-#      dh_installemacsen -a
-#      dh_installifupdown -a
-#      dh_installinfo -a
-#      dh_pysupport -a
-#      dh_numpy -a
-#      dh_installinit -a
-#      dh_installmenu -a
-#      dh_installmime -a
-#      dh_installmodules -a
-#      dh_installlogcheck -a
-#      dh_installlogrotate -a
-#      dh_installpam -a
-#      dh_installppp -a
-#      dh_installudev -a
-#      dh_installwm -a
-#      dh_installxfonts -a
-#      dh_bugfiles -a
-#      dh_lintian -a
-#      dh_gconf -a
-#      dh_icons -a
-#      dh_perl -a
-#      dh_usrlocal -a
+       dh_installemacsen -a
+       dh_installifupdown -a
+       dh_installinfo -a
+       dh_pysupport -a
+       dh_numpy -a
+       dh_installinit -a
+       dh_installmenu -a
+       dh_installmime -a
+       dh_installmodules -a
+       dh_installlogcheck -a
+       dh_installlogrotate -a
+       dh_installpam -a
+       dh_installppp -a
+       dh_installudev -a
+       dh_installwm -a
+       dh_installxfonts -a
+       dh_bugfiles -a
+       dh_lintian -a
+       dh_gconf -a
+       dh_icons -a
+       dh_perl -a
+       dh_usrlocal -a
        dh_link -a
        dh_compress -a
        dh_fixperms -a