r21951 - /packages/unstable/gobject-introspection/debian/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Oct 18 10:23:38 UTC 2009
Author: joss
Date: Sun Oct 18 10:23:37 2009
New Revision: 21951
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21951
Log:
+ Install it in /usr/bin.
* policy.txt: ship the GObject introspection mini policy.
* Rename packages and rearrange files according to it.
* Fix sections accordingly.
Added:
packages/unstable/gobject-introspection/debian/gir1.0-freedesktop.install
- copied, changed from r21804, packages/unstable/gobject-introspection/debian/gobject-introspection-freedesktop.install
packages/unstable/gobject-introspection/debian/gir1.0-glib-2.0.install
- copied, changed from r21804, packages/unstable/gobject-introspection/debian/gobject-introspection-glib-2.0.install
packages/unstable/gobject-introspection/debian/gobject-introspection.docs
packages/unstable/gobject-introspection/debian/gobject-introspection.manpages
packages/unstable/gobject-introspection/debian/policy.txt
Removed:
packages/unstable/gobject-introspection/debian/gobject-introspection-freedesktop.install
packages/unstable/gobject-introspection/debian/gobject-introspection-glib-2.0.install
Modified:
packages/unstable/gobject-introspection/debian/changelog
packages/unstable/gobject-introspection/debian/control
packages/unstable/gobject-introspection/debian/control.in
packages/unstable/gobject-introspection/debian/dh_girepository
packages/unstable/gobject-introspection/debian/gobject-introspection.install
packages/unstable/gobject-introspection/debian/libgirepository1.0-dev.install
packages/unstable/gobject-introspection/debian/rules
Modified: packages/unstable/gobject-introspection/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gobject-introspection/debian/changelog?rev=21951&op=diff
==============================================================================
--- packages/unstable/gobject-introspection/debian/changelog [utf-8] (original)
+++ packages/unstable/gobject-introspection/debian/changelog [utf-8] Sun Oct 18 10:23:37 2009
@@ -1,11 +1,15 @@
-gobject-introspection (0.6.5-3) UNRELEASED; urgency=low
+gobject-introspection (0.6.5-3) unstable; urgency=low
* Remove obsolete statement regarding a dropped package.
* Switch to python-support, the dependencies created by python-central
are broken.
* Introduce debhelper script, dh_girepository.
+ + Install it in /usr/bin.
+ * policy.txt: ship the GObject introspection mini policy.
+ * Rename packages and rearrange files according to it.
+ * Fix sections accordingly.
- -- Josselin Mouette <joss at debian.org> Sat, 17 Oct 2009 15:26:49 +0200
+ -- Josselin Mouette <joss at debian.org> Sun, 18 Oct 2009 11:57:20 +0200
gobject-introspection (0.6.5-2) unstable; urgency=low
Modified: packages/unstable/gobject-introspection/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gobject-introspection/debian/control?rev=21951&op=diff
==============================================================================
--- packages/unstable/gobject-introspection/debian/control [utf-8] (original)
+++ packages/unstable/gobject-introspection/debian/control [utf-8] Sun Oct 18 10:23:37 2009
@@ -19,6 +19,7 @@
Homepage: http://live.gnome.org/GObjectIntrospection
Package: libgirepository1.0-0
+Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -41,7 +42,9 @@
libglib2.0-dev (>= 2.16.0),
${shlibs:Depends},
${misc:Depends}
-Conflicts: libgirepository-dev
+Conflicts: libgirepository-dev,
+ gobject-introspection-glib-2.0,
+ gobject-introspection-freedesktop
Replaces: libgirepository-dev
Description: Library for handling GObject introspection data (development files)
GObject Introspection is a project for providing machine readable
@@ -76,13 +79,12 @@
This package contains tools for extracting introspection data from libraries
and transforming it to different formats.
-Package: gobject-introspection-glib-2.0
+Package: gir1.0-glib-2.0
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libglib2.0-0
-Recommends: libglib2.0-dev,
- gobject-introspection
+Section: libs
+Depends: ${gir:Depends},
+ ${misc:Depends}
+Conflicts: gobject-introspection-glib-2.0
Description: Introspection data for GLib, GObject, Gio and GModule
GObject Introspection is a project for providing machine readable
introspection data of the API of C libraries. This introspection
@@ -96,26 +98,12 @@
This package contains the introspection data for the GLib, GObject,
GModule and Gio libraries.
-Package: gobject-introspection-freedesktop
+Package: gir1.0-freedesktop
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libcairo2,
- libfontconfig1,
- libfreetype6,
- libx11-6,
- libxfixes3,
- libxft2,
- libxml2
-Recommends: libcairo2-dev,
- libfontconfig1-dev,
- libfreetype6-dev,
- libx11-dev,
- libxfixes-dev,
- libxft-dev,
- libxml2-dev,
- mesa-common-dev,
- gobject-introspection
+Section: libs
+Depends: ${gir:Depends},
+ ${misc:Depends}
+Conflicts: gobject-introspection-freedesktop
Description: Introspection data for some FreeDesktop components
GObject Introspection is a project for providing machine readable
introspection data of the API of C libraries. This introspection
@@ -126,8 +114,9 @@
GObject Introspection contains tools to generate and handle the
introspection data.
.
- This package contains the introspection data for the Cairo,
+ This package contains small pieces of introspection data for the Cairo,
FontConfig, FreeType, GL, and some XOrg libraries. They are
distributed in this package temporarily, while the original sources
- do not include support for GObject Introspection.
-
+ do not include support for GObject Introspection. They are far from
+ complete and only include what is necessary for other introspection
+ packages to work properly.
Modified: packages/unstable/gobject-introspection/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gobject-introspection/debian/control.in?rev=21951&op=diff
==============================================================================
--- packages/unstable/gobject-introspection/debian/control.in [utf-8] (original)
+++ packages/unstable/gobject-introspection/debian/control.in [utf-8] Sun Oct 18 10:23:37 2009
@@ -19,6 +19,7 @@
Homepage: http://live.gnome.org/GObjectIntrospection
Package: libgirepository1.0-0
+Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -41,7 +42,9 @@
libglib2.0-dev (>= 2.16.0),
${shlibs:Depends},
${misc:Depends}
-Conflicts: libgirepository-dev
+Conflicts: libgirepository-dev,
+ gobject-introspection-glib-2.0,
+ gobject-introspection-freedesktop
Replaces: libgirepository-dev
Description: Library for handling GObject introspection data (development files)
GObject Introspection is a project for providing machine readable
@@ -76,13 +79,12 @@
This package contains tools for extracting introspection data from libraries
and transforming it to different formats.
-Package: gobject-introspection-glib-2.0
+Package: gir1.0-glib-2.0
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libglib2.0-0
-Recommends: libglib2.0-dev,
- gobject-introspection
+Section: libs
+Depends: ${gir:Depends},
+ ${misc:Depends}
+Conflicts: gobject-introspection-glib-2.0
Description: Introspection data for GLib, GObject, Gio and GModule
GObject Introspection is a project for providing machine readable
introspection data of the API of C libraries. This introspection
@@ -96,26 +98,12 @@
This package contains the introspection data for the GLib, GObject,
GModule and Gio libraries.
-Package: gobject-introspection-freedesktop
+Package: gir1.0-freedesktop
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libcairo2,
- libfontconfig1,
- libfreetype6,
- libx11-6,
- libxfixes3,
- libxft2,
- libxml2
-Recommends: libcairo2-dev,
- libfontconfig1-dev,
- libfreetype6-dev,
- libx11-dev,
- libxfixes-dev,
- libxft-dev,
- libxml2-dev,
- mesa-common-dev,
- gobject-introspection
+Section: libs
+Depends: ${gir:Depends},
+ ${misc:Depends}
+Conflicts: gobject-introspection-freedesktop
Description: Introspection data for some FreeDesktop components
GObject Introspection is a project for providing machine readable
introspection data of the API of C libraries. This introspection
@@ -126,8 +114,9 @@
GObject Introspection contains tools to generate and handle the
introspection data.
.
- This package contains the introspection data for the Cairo,
+ This package contains small pieces of introspection data for the Cairo,
FontConfig, FreeType, GL, and some XOrg libraries. They are
distributed in this package temporarily, while the original sources
- do not include support for GObject Introspection.
-
+ do not include support for GObject Introspection. They are far from
+ complete and only include what is necessary for other introspection
+ packages to work properly.
Modified: packages/unstable/gobject-introspection/debian/dh_girepository
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gobject-introspection/debian/dh_girepository?rev=21951&op=diff
==============================================================================
--- packages/unstable/gobject-introspection/debian/dh_girepository [utf-8] (original)
+++ packages/unstable/gobject-introspection/debian/dh_girepository [utf-8] Sun Oct 18 10:23:37 2009
@@ -38,6 +38,10 @@
analyzed.
=back
+
+=head1 CONFORMS TO
+
+GObject introspection mini policy as of 2009-10-18.
=cut
@@ -290,3 +294,15 @@
}
}
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is a part of gobject-introspection but is made to work with
+debhelper.
+
+=head1 AUTHOR
+
+Josselin Mouette <joss at debian.org>
+
+=cut
Copied: packages/unstable/gobject-introspection/debian/gir1.0-freedesktop.install (from r21804, packages/unstable/gobject-introspection/debian/gobject-introspection-freedesktop.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gobject-introspection/debian/gir1.0-freedesktop.install?rev=21951&op=diff
==============================================================================
--- packages/unstable/gobject-introspection/debian/gobject-introspection-freedesktop.install [utf-8] (original)
+++ packages/unstable/gobject-introspection/debian/gir1.0-freedesktop.install [utf-8] Sun Oct 18 10:23:37 2009
@@ -1,11 +1,3 @@
-debian/tmp/usr/share/gir-1.0/cairo-1.0.gir
-debian/tmp/usr/share/gir-1.0/fontconfig-2.0.gir
-debian/tmp/usr/share/gir-1.0/freetype2-2.0.gir
-debian/tmp/usr/share/gir-1.0/GL-1.0.gir
-debian/tmp/usr/share/gir-1.0/libxml2-2.0.gir
-debian/tmp/usr/share/gir-1.0/xfixes-4.0.gir
-debian/tmp/usr/share/gir-1.0/xft-2.0.gir
-debian/tmp/usr/share/gir-1.0/xlib-2.0.gir
debian/tmp/usr/lib/girepository-1.0/cairo-1.0.typelib
debian/tmp/usr/lib/girepository-1.0/fontconfig-2.0.typelib
debian/tmp/usr/lib/girepository-1.0/freetype2-2.0.typelib
Copied: packages/unstable/gobject-introspection/debian/gir1.0-glib-2.0.install (from r21804, packages/unstable/gobject-introspection/debian/gobject-introspection-glib-2.0.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gobject-introspection/debian/gir1.0-glib-2.0.install?rev=21951&op=diff
==============================================================================
--- packages/unstable/gobject-introspection/debian/gobject-introspection-glib-2.0.install [utf-8] (original)
+++ packages/unstable/gobject-introspection/debian/gir1.0-glib-2.0.install [utf-8] Sun Oct 18 10:23:37 2009
@@ -1,8 +1,3 @@
-debian/tmp/usr/share/gir-1.0/GModule-2.0.gir
-debian/tmp/usr/share/gir-1.0/GLib-2.0.gir
-debian/tmp/usr/share/gir-1.0/GIRepository-2.0.gir
-debian/tmp/usr/share/gir-1.0/GObject-2.0.gir
-debian/tmp/usr/share/gir-1.0/Gio-2.0.gir
debian/tmp/usr/lib/girepository-1.0/Gio-2.0.typelib
debian/tmp/usr/lib/girepository-1.0/GObject-2.0.typelib
debian/tmp/usr/lib/girepository-1.0/GLib-2.0.typelib
Added: packages/unstable/gobject-introspection/debian/gobject-introspection.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gobject-introspection/debian/gobject-introspection.docs?rev=21951&op=file
==============================================================================
--- packages/unstable/gobject-introspection/debian/gobject-introspection.docs (added)
+++ packages/unstable/gobject-introspection/debian/gobject-introspection.docs [utf-8] Sun Oct 18 10:23:37 2009
@@ -1,0 +1,1 @@
+debian/policy.txt
Modified: packages/unstable/gobject-introspection/debian/gobject-introspection.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gobject-introspection/debian/gobject-introspection.install?rev=21951&op=diff
==============================================================================
--- packages/unstable/gobject-introspection/debian/gobject-introspection.install [utf-8] (original)
+++ packages/unstable/gobject-introspection/debian/gobject-introspection.install [utf-8] Sun Oct 18 10:23:37 2009
@@ -2,3 +2,4 @@
debian/tmp/usr/share/man
debian/tmp/usr/lib/gobject-introspection/giscanner/*.py
debian/tmp/usr/lib/gobject-introspection/giscanner/*.so
+debian/dh_girepository /usr/bin
Added: packages/unstable/gobject-introspection/debian/gobject-introspection.manpages
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gobject-introspection/debian/gobject-introspection.manpages?rev=21951&op=file
==============================================================================
--- packages/unstable/gobject-introspection/debian/gobject-introspection.manpages (added)
+++ packages/unstable/gobject-introspection/debian/gobject-introspection.manpages [utf-8] Sun Oct 18 10:23:37 2009
@@ -1,0 +1,1 @@
+debian/dh_girepository.1
Modified: packages/unstable/gobject-introspection/debian/libgirepository1.0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gobject-introspection/debian/libgirepository1.0-dev.install?rev=21951&op=diff
==============================================================================
--- packages/unstable/gobject-introspection/debian/libgirepository1.0-dev.install [utf-8] (original)
+++ packages/unstable/gobject-introspection/debian/libgirepository1.0-dev.install [utf-8] Sun Oct 18 10:23:37 2009
@@ -2,3 +2,4 @@
debian/tmp/usr/lib/libgirepository-1.0.a
debian/tmp/usr/include
debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/gir-1.0
Added: packages/unstable/gobject-introspection/debian/policy.txt
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gobject-introspection/debian/policy.txt?rev=21951&op=file
==============================================================================
--- packages/unstable/gobject-introspection/debian/policy.txt (added)
+++ packages/unstable/gobject-introspection/debian/policy.txt [utf-8] Sun Oct 18 10:23:37 2009
@@ -1,0 +1,95 @@
+GObject introspection mini-policy
+=================================
+
+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
+
+
+2. Binary introspection packages
+
+The binary typelib file must be put in an architecture-dependent package
+named after its namespace. The name should be gir1.0-NAMESPACE-VERSION.
+For example, the package containing WebKit-1.0.typelib will be named
+gir1.0-webkit-1.0.
+
+Giant repositories of unrelated introspection data should be avoided.
+However, related libraries that are known to evolve together can live in
+the same package (example: Gst*-0.10).
+
+Introspection packages belong in section libs for the moment. If there
+are enough packages to justify it, a new section will be requested to
+the FTP masters.
+
+
+3. XML introspection data
+
+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.
+
+If the source package also contains the library itself, this data should
+be in the development binary package. If the introspection data is split
+from the library source (e.g. for gobject-instrospection-repository), a
+separate package containing this XML data can be created, in section
+libdevel.
+
+The package containing the XML data doesn’t need to depend on the
+introspection package. It can contain XML data for several unrelated
+libraries, since in the end it doesn’t depend on them.
+
+
+4. Dependencies of introspection packages
+
+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
+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
+must be set, with sufficient version information.
+
+Packages containing the XML data don’t need any specific new
+dependencies.
+
+
+5. Dependencies on introspection packages
+
+Currently, there are only Seed (JavaScript) scripts to use these
+introspection packages. In the future, there might also be Python or
+other interpreted languages.
+
+Generating dependencies automatically for interpreted languages is not
+reliable. Therefore, these packages must depend by hand on the
+appropriate gir1.0-* packages. The interpreters themselves don’t need to
+depend on packages they don’t use directly.
+
+
+6. Example
+
+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.0-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.0-foo-2.0 Depends: ${gir:Depends} which expands to:
+libfoo-2.0-3, gir1.0-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
+
+Then foobar Depends: gir1.0-foo-2.0
Modified: packages/unstable/gobject-introspection/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gobject-introspection/debian/rules?rev=21951&op=diff
==============================================================================
--- packages/unstable/gobject-introspection/debian/rules [utf-8] (original)
+++ packages/unstable/gobject-introspection/debian/rules [utf-8] Sun Oct 18 10:23:37 2009
@@ -16,5 +16,13 @@
binary-install/gobject-introspection::
dh_pysupport -p$(cdbs_curpkg)
+build/gobject-introspection:: debian/dh_girepository.1
+debian/dh_girepository.1:: debian/dh_girepository
+ pod2man -c "gobject-introspection" -r "$(DEB_VERSION)" $< $@
+
+$(patsubst %,binary-fixup/%,$(DEB_ALL_PACKAGES)) ::
+ debian/gobject-introspection/usr/bin/dh_girepository -p$(cdbs_curpkg)
+
clean::
rm -rf $(CURDIR)/.cache
+ rm -f debian/dh_girepository.1
More information about the pkg-gnome-commits
mailing list