r18864 - in /desktop/unstable/gtkmm-documentation/debian: changelog control control.in

Sun Mar 8 08:45:22 UTC 2009

Author: manphiz-guest
Date: Sun Mar  8 08:45:22 2009
New Revision: 18864

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18864
Log:
Conflicts/Replaces: libgtkmm-2.4-doc (<< 1:2.14.3-2).
Target unstable.

Modified:
    desktop/unstable/gtkmm-documentation/debian/changelog
    desktop/unstable/gtkmm-documentation/debian/control
    desktop/unstable/gtkmm-documentation/debian/control.in

Modified: desktop/unstable/gtkmm-documentation/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm-documentation/debian/changelog?rev=18864&op=diff
==============================================================================

--- desktop/unstable/gtkmm-documentation/debian/changelog (original)
+++ desktop/unstable/gtkmm-documentation/debian/changelog Sun Mar  8 08:45:22 2009
@@ -1,4 +1,4 @@
-gtkmm-documentation (2.14.0-2) UNRELEASED; urgency=low
+gtkmm-documentation (2.14.0-2) unstable; urgency=low
 
   * Upload to unstable.  Drop check-dist.mk
   * Track unstable branch in Vcs-*.
@@ -6,9 +6,9 @@
   * Gtkmm FAQ migration from libgtkmm-2.4-doc:
     + Provide faq links.
     + Update doc-base for faq to point to /usr/share/doc/gtkmm-2.4/docs/FAQ/*.
-    + Replaces: libgtkmm-2.4-doc (<< 1:2.14.3-2).
+    + Conflicts/Replaces: libgtkmm-2.4-doc (<< 1:2.14.3-2).
 
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Fri, 06 Mar 2009 10:42:21 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Sun, 08 Mar 2009 16:42:42 +0800
 
 gtkmm-documentation (2.14.0-1) experimental; urgency=low
 

Modified: desktop/unstable/gtkmm-documentation/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm-documentation/debian/control?rev=18864&op=diff
==============================================================================
--- desktop/unstable/gtkmm-documentation/debian/control (original)
+++ desktop/unstable/gtkmm-documentation/debian/control Sun Mar  8 08:45:22 2009
@@ -28,6 +28,7 @@
          libgtkmm-2.4-doc
 Recommends: libglibmm-2.4-doc,
             libglademm-2.4-doc
+Conflicts: libgtkmm-2.4-doc (<< 1:2.14.3-2)
 Replaces: libgtkmm-2.4-doc (<< 1:2.14.3-2)
 Description: Documentation of C++ wrappers for GLib/GTK+/libglade
  GLib is a low-level general-purpose library used mainly by GTK+/GNOME

Modified: desktop/unstable/gtkmm-documentation/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm-documentation/debian/control.in?rev=18864&op=diff
==============================================================================
--- desktop/unstable/gtkmm-documentation/debian/control.in (original)
+++ desktop/unstable/gtkmm-documentation/debian/control.in Sun Mar  8 08:45:22 2009
@@ -28,6 +28,7 @@
          libgtkmm-2.4-doc
 Recommends: libglibmm-2.4-doc,
             libglademm-2.4-doc
+Conflicts: libgtkmm-2.4-doc (<< 1:2.14.3-2)
 Replaces: libgtkmm-2.4-doc (<< 1:2.14.3-2)
 Description: Documentation of C++ wrappers for GLib/GTK+/libglade
  GLib is a low-level general-purpose library used mainly by GTK+/GNOME


