Merge lp:~dobey/ubuntu/precise/avahi/bring-back-gir into lp:ubuntu/precise/avahi

[dobey]

[Michael Terry (mterry)]

I tried building this in a pbuilder and got:

make[5]: *** No rule to make target `AvahiCore-0.6.typelib', needed by `all-am'. Stop.

review: Needs Fixing

[dobey (dobey)]

Apparently libgirepository-dev doesn't pull in gobject-introspection, so had to add that too.

[Michael Terry (mterry)]

Shouldn't AvahiCore.gir be in libavahi-core-dev instead of libavahi-gobject-dev? And a similar split for the gir1.2-* packages right?

[dobey (dobey)]

When they were packaged from the old gir-repository package before, they were both in gir1.0-avahi-0.6, with the .gir files in gir-repository-dev.

Also, in the source tree, they are both under the avahi-gobject/ directory, and gobject-introspection still requires libgobject to work, even though libavahi-core doesn't. So the gobject-dev package seems to be the most appropriate place in the avahi binary packaging.

Oh, I just realized though. I guess I probably need to Conflicts/Replaces gir-repository-dev from the libavahi-gobject-dev package as well, no?

[Colin Watson (cjwatson)]

If you're moving files from one package to another (even if there was a
period when the files were in neither package), please use
Breaks/Replaces rather than Conflicts/Replaces.

[Michael Terry (mterry)]

I still disagree that it makes sense to bundle the bindings. They have different namespaces and different associated libraries. True, you'll need gobject-introspection to understand the gir, but that is a different thing than needing libavahi-gobject. Imagine an app that only wants to use libavahi-core.

But maybe we need a third opinion.

[lp:~dobey/ubuntu/precise/avahi/bring-back-gir]

110. By dobey on 2011-10-27

Use Breaks/Replaces for the old gir-repository packages

[dobey (dobey)]

Well, glib, GTK, GStreamer, and Pango aren't split up in that way for the various different libraries they install, and this preserves the way they used to be packaged in debian from gir-repository. It doesn't seem appropriate, and an app only using avahi-core I think is more likely to use the available static bindings, than use gobject-introspection without also using the GObject-based API.

It seems the manually created AvahiCore-0.6.gir only exists to satisfy the dependency needs of the auto-generated Avahi-0.6.gir. Also, it /is/ Avahi-0.6.gir and not AvahiGObject-0.6.gir, which suggests that for using avahi with gobject-introspection, one really should be using Avahi, and not AvahiCore.

[dobey (dobey)]

Also, AvahiCore-0.6.gir only includes a few type definitions, and one single function, so probably not useful to use by itself. :)

[Michael Terry (mterry)]

An update on this: since Debian hasn't included the girs yet, I agree that it doesn't make sense to innovate around the naming ourselves. So I'm OK with the naming for now. But I did notice that when built, the typelib files get put in a multiarch location, which Python does not pick up. That should be looked into.

[Sebastien Bacher (seb128)]

Could you send your patch to Debian as well? It would be better if they reviewed and merged it there and spare us to have to decide on the binaries to use and the naming

[Sebastien Bacher (seb128)]

Rodney, could you send it to debian?

[Stéphane Graber (stgraber)]

No activity from author for a months. Please answer the questions above and mark the branch as needs merging again.

Thanks

Unmerged revisions

110. By dobey on 2011-10-27

Use Breaks/Replaces for the old gir-repository packages

109. By dobey on 2011-10-26

Also need gobject-introspection in build-depends

108. By dobey on 2011-10-21

Add gir1.2-glib-2.0 to build-depends also

107. By dobey on 2011-10-21

Add bug to changelog

106. By dobey on 2011-10-21

* Bring back the gir interface for Avahi
  - gir1.2-avahi-0.6: package for Avahi gir typelibs
  - libavahi-gobject-dev: include the .gir for Avahi

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-18 14:46:25 +0000
+++ debian/changelog	2011-10-27 13:23:25 +0000
@@ -1,3 +1,11 @@
+avahi (0.6.30-5ubuntu2) precise; urgency=low
+
+  * Bring back the gir interface for Avahi (LP: #879647)
+    - gir1.2-avahi-0.6: package for Avahi gir typelibs
+    - libavahi-gobject-dev: include the .gir for Avahi
+
+ -- Rodney Dawes <[e-mail]>  Fri, 21 Oct 2011 15:52:17 -0400
+
 avahi (0.6.30-5ubuntu1) precise; urgency=low
 
   * Merge from Debian testing.  Remaining changes:
 
=== modified file 'debian/control'
--- debian/control	2011-10-18 14:46:25 +0000
+++ debian/control	2011-10-27 13:23:25 +0000
@@ -18,6 +18,9 @@
                libexpat-dev,
                libdaemon-dev (>= 0.11),
                libdbus-1-dev (>= 0.60),
+               gobject-introspection (>= 0.9.5),
+               libgirepository1.0-dev (>= 0.9.5),
+               gir1.2-glib-2.0,
                python-all-dev (>= 2.3.5-11),
                python-gdbm (>= 2.4.3),
                python-dbus,
@@ -339,14 +342,38 @@
  .
  This library contains the GObject wrapper for Avahi.
 
+Package: gir1.2-avahi-0.6
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends},
+         libavahi-gobject0 (= ${binary:Version})
+Breaks: gir1.0-avahi-0.6
+Replaces: gir1.0-avahi-0.6
+Description: GObject Introspection data for the Avahi library
+ This package contains introspection data for the Avahi library.
+ .
+ Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
+ It allows programs to publish and discover services and hosts
+ running on a local network with no specific configuration. For
+ example you can plug into a network and instantly find printers to
+ print to, files to look at and people to talk to.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.
+
 Package: libavahi-gobject-dev
 Section: libdevel
 Architecture: any
 Depends: libavahi-gobject0 (= ${binary:Version}),
+         gir1.2-avahi-0.6 (= ${binary:Version}),
          ${misc:Depends},
          libglib2.0-dev,
          libavahi-client-dev,
          libavahi-glib-dev
+Breaks: gir-repository-dev
+Replaces: gir-repository-dev
 Description: Development headers for the Avahi GObject library
  Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
  It allows programs to publish and discover services and hosts
 
=== added file 'debian/gir1.2-avahi-0.6.install'
--- debian/gir1.2-avahi-0.6.install	1970-01-01 00:00:00 +0000
+++ debian/gir1.2-avahi-0.6.install	2011-10-27 13:23:25 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/girepository-*/Avahi*.typelib
+
 
=== modified file 'debian/libavahi-gobject-dev.install'
--- debian/libavahi-gobject-dev.install	2011-07-01 13:29:42 +0000
+++ debian/libavahi-gobject-dev.install	2011-10-27 13:23:25 +0000
@@ -2,3 +2,5 @@
 usr/lib/*/libavahi-gobject.so
 usr/lib/*/libavahi-gobject.a
 usr/lib/*/pkgconfig/avahi-gobject.pc
+usr/share/gir-*/*.gir
+