r46559 - in /desktop/unstable/glib-networking/debian: changelog control control.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Oct 13 13:42:42 2015
New Revision: 46559

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46559
Log:
Drop the Build-Conflicts against glib-networking, the test-suite passes
now with that package installed.

Modified:
    desktop/unstable/glib-networking/debian/changelog
    desktop/unstable/glib-networking/debian/control
    desktop/unstable/glib-networking/debian/control.in

Modified: desktop/unstable/glib-networking/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib-networking/debian/changelog?rev=46559&op=diff
==============================================================================
--- desktop/unstable/glib-networking/debian/changelog	[utf-8] (original)
+++ desktop/unstable/glib-networking/debian/changelog	[utf-8] Tue Oct 13 13:42:42 2015
@@ -2,6 +2,8 @@
 
   * New upstream release.
   * Refresh patches.
+  * Drop the Build-Conflicts against glib-networking, the test-suite passes
+    now with that package installed.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 13 Oct 2015 15:26:09 +0200
 

Modified: desktop/unstable/glib-networking/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib-networking/debian/control?rev=46559&op=diff
==============================================================================
--- desktop/unstable/glib-networking/debian/control	[utf-8] (original)
+++ desktop/unstable/glib-networking/debian/control	[utf-8] Tue Oct 13 13:42:42 2015
@@ -18,7 +18,6 @@
                gsettings-desktop-schemas-dev,
                ca-certificates,
                intltool (>= 0.41.1-2)
-Build-Conflicts: glib-networking
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/glib-networking
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/glib-networking/
 Standards-Version: 3.9.6

Modified: desktop/unstable/glib-networking/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib-networking/debian/control.in?rev=46559&op=diff
==============================================================================
--- desktop/unstable/glib-networking/debian/control.in	[utf-8] (original)
+++ desktop/unstable/glib-networking/debian/control.in	[utf-8] Tue Oct 13 13:42:42 2015
@@ -14,7 +14,6 @@
                gsettings-desktop-schemas-dev,
                ca-certificates,
                intltool (>= 0.41.1-2)
-Build-Conflicts: glib-networking
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/glib-networking
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/glib-networking/
 Standards-Version: 3.9.6