r31363 - in /desktop/experimental/glib-networking/debian: changelog control control.in glib-networking-common.install glib-networking-services.install glib-networking.install

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun Nov 13 15:58:36 UTC 2011 

Author: joss
Date: Sun Nov 13 15:58:36 2011
New Revision: 31363

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31363
Log:
* Break pre-multiarch glib (for modules path transition).
* glib-networking autodetects the path, no change needed.
* Split glib-networking for multiarch support:
  - glib-networking contains the gio modules (m-a: same).
  - g-n-services contains the D-Bus services (m-a: foreign).
  - g-n-common contains the data.
* Add build-conflict about glib-networking itself (fails the test 
  suite).

Added:
    desktop/experimental/glib-networking/debian/glib-networking-common.install
      - copied, changed from r31339, desktop/experimental/glib-networking/debian/glib-networking.install
    desktop/experimental/glib-networking/debian/glib-networking-services.install
      - copied, changed from r31339, desktop/experimental/glib-networking/debian/glib-networking.install
Modified:
    desktop/experimental/glib-networking/debian/changelog
    desktop/experimental/glib-networking/debian/control
    desktop/experimental/glib-networking/debian/control.in
    desktop/experimental/glib-networking/debian/glib-networking.install

Modified: desktop/experimental/glib-networking/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib-networking/debian/changelog?rev=31363&op=diff
==============================================================================
--- desktop/experimental/glib-networking/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib-networking/debian/changelog [utf-8] Sun Nov 13 15:58:36 2011
@@ -1,3 +1,16 @@
+glib-networking (2.30.1-2) experimental; urgency=low
+
+  * Break pre-multiarch glib (for modules path transition).
+  * glib-networking autodetects the path, no change needed.
+  * Split glib-networking for multiarch support:
+    - glib-networking contains the gio modules (m-a: same).
+    - g-n-services contains the D-Bus services (m-a: foreign).
+    - g-n-common contains the data.
+  * Add build-conflict about glib-networking itself (fails the test 
+    suite).
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 13 Nov 2011 16:32:49 +0100
+
 glib-networking (2.30.1-1) experimental; urgency=low
 
   * New upstream bug fix release.

Modified: desktop/experimental/glib-networking/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib-networking/debian/control?rev=31363&op=diff
==============================================================================
--- desktop/experimental/glib-networking/debian/control [utf-8] (original)
+++ desktop/experimental/glib-networking/debian/control [utf-8] Sun Nov 13 15:58:36 2011
@@ -17,18 +17,49 @@
                gsettings-desktop-schemas-dev,
                ca-certificates,
                intltool (>= 0.41.1-2)
+Build-Conflicts: glib-networking
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glib-networking
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/glib-networking
 Standards-Version: 3.9.2
 
 Package: glib-networking
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         glib-networking-services (>= ${source:Version}),
+         glib-networking-services (<< ${source:Version}.1~),
+         glib-networking-common (= ${source:Version}),
          gsettings-desktop-schemas
+Breaks: libglib2.0-0 (<< 2.30.1-2)
 Description: network-related giomodules for GLib
- This package contains various network related extension points
- for GLib.
+ This package contains various network related extensions for the GIO 
+ library.
+
+Package: glib-networking-services
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         glib-networking-common (= ${source:Version})
+Recommends: glib-networking
+Breaks: glib-networking (<< 2.30.1-2)
+Replaces: glib-networking (<< 2.30.1-2)
+Description: network-related giomodules for GLib - D-Bus services
+ This package contains D-Bus services that are used by the GIO network
+ extensions in glib-networking, for actions that need to be done in a 
+ separate process.
+
+Package: glib-networking-common
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Recommends: glib-networking
+Breaks: glib-networking (<< 2.30.1-2)
+Replaces: glib-networking (<< 2.30.1-2)
+Description: network-related giomodules for GLib - data files
+ This package contains data files and translations for the GIO network
+ extensions in glib-networking.
 
 Package: glib-networking-dbg
 Architecture: any
@@ -37,9 +68,6 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          glib-networking (= ${binary:Version})
-Description: network-related giomodules for GLib (debugging symbols
- This package contains various network related extension points
- for GLib.
- .
- This package contains the debugging symbols for glib-networking.
-
+Description: network-related giomodules for GLib - debugging symbols
+ This package contains the debugging symbols for the GIO extensions and 
+ D-Bus services in glib-networking.

Modified: desktop/experimental/glib-networking/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib-networking/debian/control.in?rev=31363&op=diff
==============================================================================
--- desktop/experimental/glib-networking/debian/control.in [utf-8] (original)
+++ desktop/experimental/glib-networking/debian/control.in [utf-8] Sun Nov 13 15:58:36 2011
@@ -12,18 +12,49 @@
                gsettings-desktop-schemas-dev,
                ca-certificates,
                intltool (>= 0.41.1-2)
+Build-Conflicts: glib-networking
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glib-networking
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/glib-networking
 Standards-Version: 3.9.2
 
 Package: glib-networking
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         glib-networking-services (>= ${source:Version}),
+         glib-networking-services (<< ${source:Version}.1~),
+         glib-networking-common (= ${source:Version}),
          gsettings-desktop-schemas
+Breaks: libglib2.0-0 (<< 2.30.1-2)
 Description: network-related giomodules for GLib
- This package contains various network related extension points
- for GLib.
+ This package contains various network related extensions for the GIO 
+ library.
+
+Package: glib-networking-services
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         glib-networking-common (= ${source:Version})
+Recommends: glib-networking
+Breaks: glib-networking (<< 2.30.1-2)
+Replaces: glib-networking (<< 2.30.1-2)
+Description: network-related giomodules for GLib - D-Bus services
+ This package contains D-Bus services that are used by the GIO network
+ extensions in glib-networking, for actions that need to be done in a 
+ separate process.
+
+Package: glib-networking-common
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Recommends: glib-networking
+Breaks: glib-networking (<< 2.30.1-2)
+Replaces: glib-networking (<< 2.30.1-2)
+Description: network-related giomodules for GLib - data files
+ This package contains data files and translations for the GIO network
+ extensions in glib-networking.
 
 Package: glib-networking-dbg
 Architecture: any
@@ -32,9 +63,6 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          glib-networking (= ${binary:Version})
-Description: network-related giomodules for GLib (debugging symbols
- This package contains various network related extension points
- for GLib.
- .
- This package contains the debugging symbols for glib-networking.
-
+Description: network-related giomodules for GLib - debugging symbols
+ This package contains the debugging symbols for the GIO extensions and 
+ D-Bus services in glib-networking.

Copied: desktop/experimental/glib-networking/debian/glib-networking-common.install (from r31339, desktop/experimental/glib-networking/debian/glib-networking.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib-networking/debian/glib-networking-common.install?rev=31363&op=diff
==============================================================================
--- desktop/experimental/glib-networking/debian/glib-networking.install [utf-8] (original)
+++ desktop/experimental/glib-networking/debian/glib-networking-common.install [utf-8] Sun Nov 13 15:58:36 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/
+debian/tmp/usr/share/locale

Copied: desktop/experimental/glib-networking/debian/glib-networking-services.install (from r31339, desktop/experimental/glib-networking/debian/glib-networking.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib-networking/debian/glib-networking-services.install?rev=31363&op=diff
==============================================================================
--- desktop/experimental/glib-networking/debian/glib-networking.install [utf-8] (original)
+++ desktop/experimental/glib-networking/debian/glib-networking-services.install [utf-8] Sun Nov 13 15:58:36 2011
@@ -1,1 +1,2 @@
-debian/tmp/usr/
+debian/tmp/usr/lib/glib-networking
+debian/tmp/usr/share/dbus-1

Modified: desktop/experimental/glib-networking/debian/glib-networking.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib-networking/debian/glib-networking.install?rev=31363&op=diff
==============================================================================
--- desktop/experimental/glib-networking/debian/glib-networking.install [utf-8] (original)
+++ desktop/experimental/glib-networking/debian/glib-networking.install [utf-8] Sun Nov 13 15:58:36 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/
+debian/tmp/usr/lib/*/gio

More information about the pkg-gnome-commits mailing list