r13053 - in /desktop/unstable/glibmm2.4/debian: changelog control libglibmm-2.4-doc.docs

[manphiz-guest at users.alioth.debian.org]

Author: manphiz-guest
Date: Wed Oct 10 02:52:06 2007
New Revision: 13053

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13053
Log:
Let -doc conflict with older version of -dev, since it is splitted from there;
Don't ship examples currently, until find a way to disable building them;
Don't Suggests libgtkmm-2.4-{dev,doc} in libglibmm-2.4-dev, Suggests libglibmm-2.4-doc instead.

Modified:
    desktop/unstable/glibmm2.4/debian/changelog
    desktop/unstable/glibmm2.4/debian/control
    desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.docs

Modified: desktop/unstable/glibmm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/changelog?rev=13053&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/changelog (original)
+++ desktop/unstable/glibmm2.4/debian/changelog Wed Oct 10 02:52:06 2007
@@ -4,8 +4,9 @@
     - Fixed shadowed member warning. Closes: #415464
   * Update glib2.0 dependency to 2.14.0 and later.
   * Refine dependency fields in debian/control.
-  * Move documentation and examples to -doc package.
-  * Use named shlib version in debian/rules.
+  * Split documentation from -dev to -doc package, and make it 
+    conflict with older -dev version.
+  * Use named shlibs version in debian/rules.
   * Update watch file URL to 2.14 releases.
   * Migrated ownership to Debian GNOME Team.
     - Added myself as maintainer with consensus from Debian GNOME Team.
@@ -13,7 +14,7 @@
       Team now. Thanks Bradley.
     - Added Debian GNOME Team as uploaders.
 
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Wed, 10 Oct 2007 00:40:37 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Wed, 10 Oct 2007 10:46:24 +0800
 
 glibmm2.4 (2.12.10-0.1) unstable; urgency=low
 

Modified: desktop/unstable/glibmm2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/control?rev=13053&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/control (original)
+++ desktop/unstable/glibmm2.4/debian/control Wed Oct 10 02:52:06 2007
@@ -26,7 +26,7 @@
 Architecture: any
 Depends: libglibmm-2.4-1c2a (= ${binary:Version}),
          pkg-config (>= 0.14.0)
-Suggests: libgtkmm-2.4-dev, libgtkmm-2.4-doc
+Suggests: libglibmm-2.4-doc
 Conflicts: libglibmm2.3-dev
 Replaces: libglibmm2.3-dev
 Description: C++ wrapper for the GLib toolkit (development files)
@@ -52,10 +52,11 @@
 Section: doc
 Architecture: all
 Depends: lynx | www-browser
+Conflicts: libglibmm-2.4-dev (<< 2.14.0)
 Description: C++ wrapper for the GLib toolkit (shared libraries)
  GLib is a low-level general-purpose library used mainly by GTK+/GNOME
  applications, but is useful for other programs as well.
  glibmm is the C++ wrapper for GLib.
  .
- This package contains reference documentation, and examples.
+ This package contains reference documentation.
 

Modified: desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.docs?rev=13053&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.docs (original)
+++ desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.docs Wed Oct 10 02:52:06 2007
@@ -4,10 +4,3 @@
 docs/images
 docs/internal
 docs/reference
-examples/README
-examples/child_watch
-examples/iochannel_stream
-examples/markup
-examples/options
-examples/regex
-examples/thread