r26332 - in /desktop/experimental/glib2.0/debian: changelog control control.in

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sun Jan 16 23:27:35 2011
New Revision: 26332

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26332
Log:
* debian/control.in:
  + Drop obsolete conflicts/replaces with libglib1.3.
  + Don't suggest libgtk2.0-doc in the doc package.

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/control
    desktop/experimental/glib2.0/debian/control.in

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=26332&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Sun Jan 16 23:27:35 2011
@@ -1,3 +1,11 @@
+glib2.0 (2.27.91-2) UNRELEASED; urgency=low
+
+  * debian/control.in:
+    + Drop obsolete conflicts/replaces with libglib1.3.
+    + Don't suggest libgtk2.0-doc in the doc package.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 16 Jan 2011 23:24:36 +0000
+
 glib2.0 (2.27.91-1) experimental; urgency=low
 
   * debian/rules:

Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=26332&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control [utf-8] Sun Jan 16 23:27:35 2011
@@ -84,8 +84,6 @@
          zlib1g-dev
 Recommends: python
 Suggests: libglib2.0-doc
-Replaces: libglib1.3-dev
-Conflicts: libglib1.3-dev
 Description: Development files for the GLib library
  GLib is a library containing many useful C routines for things such
  as trees, hashes, lists, and strings.  It is a useful general-purpose
@@ -116,9 +114,6 @@
 Architecture: all
 Depends: ${misc:Depends},
          libglib2.0-0 (>= ${source:Version})
-Replaces: libglib1.3,
-          libglib1.3-data
-Conflicts: libglib1.3-data
 Description: Common files for GLib library
  GLib is a library containing many useful C routines for things such
  as trees, hashes, lists, and strings.  It is a useful general-purpose
@@ -131,9 +126,7 @@
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Replaces: libglib1.3-doc
-Conflicts: libglib1.3-doc
-Suggests: libgtk2.0-doc, devhelp
+Suggests: devhelp
 Description: Documentation files for the GLib library
  GLib is a library containing many useful C routines for things such
  as trees, hashes, lists, and strings.  It is a useful general-purpose

Modified: desktop/experimental/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control.in?rev=26332&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control.in [utf-8] Sun Jan 16 23:27:35 2011
@@ -84,8 +84,6 @@
          zlib1g-dev
 Recommends: python
 Suggests: @DOC_PKG@
-Replaces: libglib1.3-dev
-Conflicts: libglib1.3-dev
 Description: Development files for the GLib library
  GLib is a library containing many useful C routines for things such
  as trees, hashes, lists, and strings.  It is a useful general-purpose
@@ -116,9 +114,6 @@
 Architecture: all
 Depends: ${misc:Depends},
          @SHARED_PKG@ (>= ${source:Version})
-Replaces: libglib1.3,
-          libglib1.3-data
-Conflicts: libglib1.3-data
 Description: Common files for GLib library
  GLib is a library containing many useful C routines for things such
  as trees, hashes, lists, and strings.  It is a useful general-purpose
@@ -131,9 +126,7 @@
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Replaces: libglib1.3-doc
-Conflicts: libglib1.3-doc
-Suggests: libgtk2.0-doc, devhelp
+Suggests: devhelp
 Description: Documentation files for the GLib library
  GLib is a library containing many useful C routines for things such
  as trees, hashes, lists, and strings.  It is a useful general-purpose