[Debian-astro-commits] [gyoto] 01/04: Simplify debian/rules, update debian/copyright, ship only one copy of the manual, install python examples.

Thibaut Jean-Claude Paumard thibaut at moszumanska.debian.org
Mon May 25 16:15:16 UTC 2015


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

thibaut pushed a commit to branch master
in repository gyoto.

commit 27e44333788630475b982fbb281e163cfae439c4
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Mon May 25 14:30:50 2015 +0200

    Simplify debian/rules, update debian/copyright, ship only one copy of the manual, install python examples.
---
 debian/clean                  |  4 +++
 debian/control                |  4 +--
 debian/copyright              | 60 +++++++++++++++++++++++++++++++++++++++++--
 debian/python-gyoto.examples  |  1 +
 debian/python3-gyoto.examples |  1 +
 debian/rules                  | 50 ++++++++++++------------------------
 6 files changed, 83 insertions(+), 37 deletions(-)

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..50fa431
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,4 @@
+doc-stamp
+build-stamp
+configure-stamp
+doc/doxygen_sqlite3.db
diff --git a/debian/control b/debian/control
index 82cf7ab..c6ee59d 100644
--- a/debian/control
+++ b/debian/control
@@ -109,7 +109,7 @@ Description: General relativistic geodesic integration for the Python 2 language
  .
  This package provides an extension for the Python 2 programing language
  exposing the Gyoto facilities. It allows using Gyoto interactively
- from the python prompt or running complex Gyoto scripts.
+ from the Python prompt or running complex Gyoto scripts.
 
 Package: python3-gyoto
 Architecture: any
@@ -121,7 +121,7 @@ Description: General relativistic geodesic integration for the Python 3 language
  .
  This package provides an extension for the Python 3 programing language
  exposing the Gyoto facilities. It allows using Gyoto interactively
- from the python3 prompt or running complex Gyoto scripts.
+ from the Python 3 prompt or running complex Gyoto scripts.
 
 Package: gyoto-doc
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 7e796cc..91c7578 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,8 @@ Upstream-Name: gyoto
 Source: https://github.com/gyoto/Gyoto
 
 Files: *
-Copyright: 2011-2013 Thibaut Paumard -- thibaut.paumard at obspm.fr
-           2011-2013 Frédéric Vincent -- frederic.vincent at obspm.fr
+Copyright: 2011-2015 Thibaut Paumard -- thibaut.paumard at obspm.fr
+           2011-2015 Frédéric Vincent -- frederic.vincent at obspm.fr
 License: GPL-3.0+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -22,3 +22,59 @@ License: GPL-3.0+
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 
+Files: python/doxy2swig.py
+Copyright: 2008 Prabhu Ramachandran
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: python/numpy.i
+Copyright: Copyright (c) 2005-2015, NumPy Developers <numpy-dev at numpy.org>
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+     * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+ .
+     * Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials provided
+        with the distribution.
+ .
+     * Neither the name of the NumPy Developers nor the names of any
+        contributors may be used to endorse or promote products derived
+        from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/python-gyoto.examples b/debian/python-gyoto.examples
new file mode 100644
index 0000000..17e2c7f
--- /dev/null
+++ b/debian/python-gyoto.examples
@@ -0,0 +1 @@
+python/example*.py
diff --git a/debian/python3-gyoto.examples b/debian/python3-gyoto.examples
new file mode 100644
index 0000000..17e2c7f
--- /dev/null
+++ b/debian/python3-gyoto.examples
@@ -0,0 +1 @@
+python/example*.py
diff --git a/debian/rules b/debian/rules
index e0feaf4..61d14c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,15 +23,22 @@ configure_flags = --with-yorick=/usr/bin/yorick --with-udunits --with-xerces \
 	dh $@ --with python2,python3,autotools-dev
 
 override_dh_auto_install-arch:
-	dh_auto_install
+	dh_auto_install -a
+	sh debian/install_for_all_pythons
+	dh_numpy -a
+	dh_numpy3 -a
+
+override_dh_auto_install-indep:
+
+override_dh_install-arch:
 	dh_install -a -N yorick-gyoto
 	dh_installyorick --no-make-install -pyorick-gyoto
 	dh_makeshlibs -a
-	sh debian/install_for_all_pythons
-	dh_numpy
-	dh_numpy3
 
-override_dh_auto_build-arch: configure-stamp
+override_dh_install-indep:
+	dh_install -i
+
+override_dh_auto_build-arch:
 	$(MAKE) COPT_DEFAULT="" \
 	     Y_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
 	     Y_LDFLAGS="$(LDFLAGS)" \
@@ -44,28 +51,15 @@ override_dh_auto_build-arch: configure-stamp
 	 make -C python PYTHON=$$python ; \
 	done
 
-install-indep: doc-stamp
-	dh_installdocs -i
-	dh_install -i
-
-build-indep: doc-stamp
-
-doc-stamp: configure-stamp
+override_dh_auto_build-indep:
 	$(MAKE) doc
 
-override_dh_auto_configure: configure-stamp
-
-configure-stamp:
-	dh_autotools-dev_updateconfig
+override_dh_auto_configure:
 	dh_auto_configure -- $(configure_flags)
-	touch configure-stamp
 
-clean: configure-stamp
-	make -C python clean
-	make distclean
+override_dh_auto_clean:
+	-make -C python clean
 	dh_auto_clean
-	dh_autotools-dev_restoreconfig
-	dh_clean doc-stamp build-stamp configure-stamp doc/doxygen_sqlite3.db
 
 override_dh_auto_test-indep:
 
@@ -73,18 +67,8 @@ override_dh_auto_test-arch:
 ifeq (,$(filter $(DEB_HOST_ARCH), kfreebsd-i386 kfreebsd-amd64 mips))
 # skip the test suite on kfreebsd-any as gyoto package not beeing built
 # skip on mips as lucatelli2 fails on it (but the binary works on other boxes)
-	LC_ALL=C.UTF-8 make check
+	LC_ALL=C.UTF-8 dh_auto_test
 endif
 
-
 override_dh_strip:
 	dh_strip --dbg-package=gyoto-dbg
-
-# maintainer-only rule
-git-clean: clean
-	debuild clean
-	-quilt pop -a
-	-rm .pc/.version .pc/.quilt_series .pc/.quilt_patches
-	if test -e .pc; then rmdir .pc; fi
-
-.PHONY: clean git-clean override_dh_strip override_dh_auto_test 

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



More information about the Debian-astro-commits mailing list