r51041 - in /desktop/unstable/gobject-introspection/debian: changelog policy.txt
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed Sep 21 18:10:55 UTC 2016
Author: biebl
Date: Wed Sep 21 18:10:54 2016
New Revision: 51041
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51041
Log:
Update policy.txt for Multi-Arch. (Closes: #766368)
Modified:
desktop/unstable/gobject-introspection/debian/changelog
desktop/unstable/gobject-introspection/debian/policy.txt
Modified: desktop/unstable/gobject-introspection/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/changelog?rev=51041&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/changelog [utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/changelog [utf-8] Wed Sep 21 18:10:54 2016
@@ -9,6 +9,7 @@
* Convert from cdbs to dh.
* Bump debhelper compat level to 10.
* Mark libgirepository1.0-dev as Multi-Arch: same. (Closes: #801672)
+ * Update policy.txt for Multi-Arch. (Closes: #766368)
-- Andreas Henriksson <andreas at fatal.se> Tue, 13 Sep 2016 15:18:15 +0200
Modified: desktop/unstable/gobject-introspection/debian/policy.txt
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/policy.txt?rev=51041&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/policy.txt [utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/policy.txt [utf-8] Wed Sep 21 18:10:54 2016
@@ -4,8 +4,11 @@
1. Directory layout
GObject-introspection data is generally provided in two formats:
- * XML format in /usr/share/gir-1.0/Foo-X.Y.gir
- * binary format in /usr/lib/girepository-1.0/Foo-X.Y.typelib
+ * XML format in /usr/share/gir-1.0/Foo-X.Y.gir
+ * binary format in /usr/lib/girepository-1.0/Foo-X.Y.typelib or
+ /usr/lib/$(DEB_HOST_MULTIARCH)/girepository-1.0/Foo-X.Y.typelib
+
+Using the multiarch paths for typelib files is recommended nowadays.
2. Binary introspection packages
@@ -15,8 +18,11 @@
For example, the package containing WebKit-1.0.typelib will be named
gir1.0-webkit-1.0 for the gir 1.0 format and gir1.2-webkit-1.0 for the
gir 1.2 format. Note that the format is specified in the .gir file
-itself and may not match the /usr/lib/girepository-1.0 and
+itself and may not match the /usr/lib/*/girepository-1.0 and
/usr/share/gir-1.0 paths.
+
+If you use multiarch paths for the typelib files, the resulting gir
+package can be marked as Multi-Arch: same.
Giant repositories of unrelated introspection data should be avoided.
However, related libraries that are known to evolve together can live in
@@ -30,9 +36,8 @@
The XML format introspection must be shipped in another
architecture-dependent* package of the same source.
- * This is so that it is guaranteed to be accessible at
- build time by the tool that will compute the
- dependencies for the .typelib files.
+ * This is so that it is guaranteed to be accessible at build time by
+ the tool that will compute the dependencies for the .typelib files.
If the source package also contains the library itself, this data should
be in the development binary package. If the introspection data is split
@@ -40,13 +45,13 @@
separate package containing this XML data can be created, in section
libdevel.
-The package containing the XML data must depend on each of the
+The package containing the XML data must depend on each of the
introspection packages that contain the corresponding binary files.
-For example, a source package would generate libfoo2.0-0, libfoo2.0-dev
+For example, a source package would generate libfoo2.0-0, libfoo2.0-dev
and gir1.2-foo-2.0.
- - gir1.2-foo-2.0 Depends: libfoo2.0-0 through the ${gir:Depends}
- - libfoo2.0-dev Depends: gir1.2-foo-2.0 (= ${binary:Version})
+ - gir1.2-foo-2.0: Depends: libfoo2.0-0 through the ${gir:Depends}
+ - libfoo2.0-dev: Depends: gir1.2-foo-2.0 (= ${binary:Version})
4. Dependencies of introspection packages
@@ -54,13 +59,13 @@
Introspection packages must depend on the libraries they reference, with
a sufficient version for the symbols they reference.
-For that effect, the dh_girepository helper, shipped in the
-gobject-introspection binary package, wraps dpkg-shlibdeps and adds all
+For that effect, the dh_girepository helper, shipped in the
+gobject-introspection binary package, wraps dpkg-shlibdeps and adds all
dependencies accordingly, in the ${gir:Depends} variable.
Introspection packages must depend on other introspection packages that
-are referenced through <include> statements. The helper generates such
-dependencies as well. Build-dependencies on packages containing them
+are referenced through <include> statements. The helper generates such
+dependencies as well. Build-dependencies on packages containing them
must be set, with sufficient version information. The dependencies must
be in the same gir format as the source package.
@@ -84,18 +89,20 @@
Suppose that libfoo-2.0 is an API built on libbar-3.0. The libfoo-2.0
source generates the following files, put in the following packages:
- libfoo-2.0-3 /usr/lib/libfoo-2.0.so.3*
- libfoo-2.0-dev /usr/lib/libfoo-2.0.so (and other usual stuff)
- libfoo-2.0-dev /usr/share/gir-1.0/Foo-2.0.gir
- gir1.2-foo-2.0 /usr/lib/girepository-1.0/Foo-2.0.typelib
+
+ - libfoo-2.0-3: /usr/lib/libfoo-2.0.so.3*
+ - libfoo-2.0-dev: /usr/lib/libfoo-2.0.so (and other usual stuff)
+ /usr/share/gir-1.0/Foo-2.0.gir
+ - gir1.2-foo-2.0: /usr/lib/*/girepository-1.0/Foo-2.0.typelib
libfoo-2.0-dev Depends: libfoo-2.0-3, libbar-3.0-dev, gir1.2-foo-2.0
gir1.2-foo-2.0 Depends: ${gir:Depends} which expands to:
libfoo-2.0-3, gir1.2-bar-3.0
If foobar is a package containing the following JS script:
- #! /usr/bin/seed
- Foo = imports.gi.Foo;
- // Stuff that uses the Foo 2.0 API
+
+ #! /usr/bin/seed
+ Foo = imports.gi.Foo;
+ // Stuff that uses the Foo 2.0 API
Then foobar Depends: gir1.2-foo-2.0
More information about the pkg-gnome-commits
mailing list