[hkl] 05/13: add the gir package
Frédéric-Emmanuel Picca
picca at alioth.debian.org
Mon Aug 26 15:06:44 UTC 2013
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch experimental
in repository hkl.
commit 23765d2a5f64c767bbe7540f9efa3070d7d46602
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Sun Aug 25 20:40:59 2013 +0200
add the gir package
---
debian/changelog | 2 +-
debian/control | 28 ++++++++++++--
debian/gir1.2-hkl-4.0.install | 1 +
debian/libhkl-dev.install | 6 +--
debian/patches/0001-build-twice-in-a-row.patch | 20 ++++++++++
debian/patches/features/fix-mips-FTBFS | 48 ------------------------
debian/patches/series | 2 +-
debian/rules | 2 +-
8 files changed, 51 insertions(+), 58 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b26e532..bcd3c9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hkl (4.0.3-5) UNRELEASED; urgency=low
+hkl (4.99.99.1610-1) UNRELEASED; urgency=low
* debian/copyright fixed using config-edit
diff --git a/debian/control b/debian/control
index ba2ee3c..7383606 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,13 @@ Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>
Section: science
Priority: extra
Build-Depends: debhelper (>= 8.0.0),
+ dh-autoreconf,
libgsl0-dev,
- libgtkmm-2.4-dev
+ libgirepository1.0-dev,
+ libgtkmm-2.4-dev,
+ python-gi,
+ python-matplotlib,
+ texinfo
Standards-Version: 3.9.4
Vcs-Browser: http://anonscm.debian.org/git/debian-science/packages/hkl.git
Vcs-Git: git://anonscm.debian.org/debian-science/packages/hkl.git
@@ -44,10 +49,11 @@ Description: diffractometer computation control library
Package: libhkl-dev
Architecture: any
Section: libdevel
-Depends: install-info,
+Depends: ${misc:Depends},
+ gir1.2-hkl-4.0 (= ${binary:Version}),
+ install-info,
libgsl0-dev,
- libhkl4 (= ${binary:Version}),
- ${misc:Depends}
+ libhkl4 (= ${binary:Version})
Description: diffractometer computation control library - development files
The hkl library is a framework for diffraction computation and
diffractometer control, heavily used at the SOLEIL synchrotron. It
@@ -87,3 +93,17 @@ Description: diffractometer computation control library - documentation
.
This package provides the documentation for hkl.
+Package: gir1.2-hkl-4.0
+Architecture: any
+Section: introspection
+Depends: ${misc:Depends},
+ ${gir:Depends}
+Description: diffractometer computation control library - gir binding The hkl library is a framework for diffraction computation and
+ diffractometer control, heavily used at the SOLEIL synchrotron. It
+ supports various types of diffractometer geometry: Eulerian 4-circle,
+ Eulerian 6-circle, kappa 4-circle, kappa 6-circle, and z-axis
+ geometry. For each of these it provides several numerically computed
+ modes, such as bisector and constant psi.
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings.
diff --git a/debian/gir1.2-hkl-4.0.install b/debian/gir1.2-hkl-4.0.install
new file mode 100644
index 0000000..75f1a9b
--- /dev/null
+++ b/debian/gir1.2-hkl-4.0.install
@@ -0,0 +1 @@
+usr/lib/girepository-1.0
diff --git a/debian/libhkl-dev.install b/debian/libhkl-dev.install
index a15a662..b625c75 100644
--- a/debian/libhkl-dev.install
+++ b/debian/libhkl-dev.install
@@ -1,5 +1,5 @@
-usr/include/hkl.h
-usr/include/hkl
+usr/include
usr/lib/pkgconfig/hkl.pc
usr/lib/libhkl.so
-usr/share/info/hkl.info
\ No newline at end of file
+usr/share/info/hkl.info
+usr/share/gir-1.0/
diff --git a/debian/patches/0001-build-twice-in-a-row.patch b/debian/patches/0001-build-twice-in-a-row.patch
new file mode 100644
index 0000000..4a00cd5
--- /dev/null
+++ b/debian/patches/0001-build-twice-in-a-row.patch
@@ -0,0 +1,20 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sun, 25 Aug 2013 18:57:18 +0200
+Subject: build twice in a row
+
+---
+ hkl/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hkl/Makefile.am b/hkl/Makefile.am
+index 095b060..6713841 100644
+--- a/hkl/Makefile.am
++++ b/hkl/Makefile.am
+@@ -5,6 +5,7 @@ AM_LDFLAGS = -no-undefined -version-info 5:0:0
+ AM_LDFLAGS += $(GSL_LIBS)
+ AM_CFLAGS = -I$(top_srcdir) \
+ -I$(top_builddir) \
++ -I$(builddir) \
+ $(GSL_CFLAGS)
+ -fvisibility=hiden
+
diff --git a/debian/patches/features/fix-mips-FTBFS b/debian/patches/features/fix-mips-FTBFS
deleted file mode 100644
index ed9b7ce..0000000
--- a/debian/patches/features/fix-mips-FTBFS
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: fix the mips FTBFS
- On mips machines make check target take to much times.
- So the build system thinks that there is a timeout and kill the
- build process. This patch reduce the size of the loop uses for the tests
- 1000 -> 10.
- .
- hkl (4.0.3-1) unstable; urgency=low
- .
- * Initial release. (Closes: #569153)
- * Thanks to Justin B Rye for package description review
- .
- The person named in the Author field signed this changelog entry.
-Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
-Bug-Debian: http://bugs.debian.org/569153
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Forwarded: http://repo.or.cz/w/hkl.git/commitdiff/7402e4e761d2730005337bdf03b121c28e54d81d
-Reviewed-By: picca at synchrotron-soleil.fr
-
---- hkl-4.0.3.orig/test/bench.c
-+++ hkl-4.0.3/test/bench.c
-@@ -23,6 +23,7 @@
- #include <sys/time.h>
- #include <hkl.h>
-
-+#define N 10
- #define SET_AXES(geometry, mu, komega, kappa, kphi, gamma, delta) do{\
- hkl_geometry_set_values_v(geometry, 6,\
- mu * HKL_DEGTORAD,\
-@@ -136,10 +137,10 @@ static void hkl_test_bench_k6c(void)
- engines = hkl_pseudo_axis_engine_list_factory(config);
- hkl_pseudo_axis_engine_list_init(engines, geom, detector, sample);
-
-- hkl_test_bench_hkl_real(engines, geom, "hkl", 1000, 1, 0, 0 );
-- hkl_test_bench_eulerians_real(engines, geom, "eulerians", 1000, 0, 90*HKL_DEGTORAD, 0 );
-- hkl_test_bench_psi_real(engines, geom, "psi", 1000, 10*HKL_DEGTORAD);
-- hkl_test_bench_q2_real(engines, geom, "q2", 1000, 1, 10*HKL_DEGTORAD);
-+ hkl_test_bench_hkl_real(engines, geom, "hkl", N, 1, 0, 0 );
-+ hkl_test_bench_eulerians_real(engines, geom, "eulerians", N, 0, 90*HKL_DEGTORAD, 0 );
-+ hkl_test_bench_psi_real(engines, geom, "psi", N, 10*HKL_DEGTORAD);
-+ hkl_test_bench_q2_real(engines, geom, "q2", N, 1, 10*HKL_DEGTORAD);
-
- hkl_pseudo_axis_engine_list_free(engines);
- hkl_sample_free(sample);
diff --git a/debian/patches/series b/debian/patches/series
index a338d9b..89665d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-features/fix-mips-FTBFS
+0001-build-twice-in-a-row.patch
diff --git a/debian/rules b/debian/rules
index d63d4e5..d3520a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
LDFLAGS += -Wl,--as-needed
%:
- dh $@
+ dh $@ --with autoreconf
get-orig-source:
uscan --verbose --force-download
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hkl.git
More information about the debian-science-commits
mailing list