r17996 - in /desktop/experimental/gucharmap/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Dec 26 19:16:16 2008
New Revision: 17996

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17996
Log:
libgucharmap2-dev conflicts and replaces libgucharmap-dev.

Modified:
    desktop/experimental/gucharmap/debian/changelog
    desktop/experimental/gucharmap/debian/control
    desktop/experimental/gucharmap/debian/control.in

Modified: desktop/experimental/gucharmap/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/changelog?rev=17996&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/changelog (original)
+++ desktop/experimental/gucharmap/debian/changelog Fri Dec 26 19:16:16 2008
@@ -1,5 +1,6 @@
 gucharmap (1:2.24.2-1) experimental; urgency=low
 
+  [ Emilio Pozuelo Monfort ]
   * New upstream release.
     - Scrolling with the wheel now updates the scrollbar. Closes: #427387.
     - Character detail window closed too fast in some cases, now fixed.
@@ -26,7 +27,10 @@
     - Make links for charmap.1 and gnome-character-map.1 to the gucharmap
       manpage.
 
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Fri, 19 Dec 2008 12:10:25 +0100
+  [ Josselin Mouette ]
+  * libgucharmap2-dev conflicts and replaces libgucharmap-dev.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 26 Dec 2008 20:17:30 +0100
 
 gucharmap (1:2.22.3-2) unstable; urgency=low
 

Modified: desktop/experimental/gucharmap/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/control?rev=17996&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/control (original)
+++ desktop/experimental/gucharmap/debian/control Fri Dec 26 19:16:16 2008
@@ -42,9 +42,11 @@
          libgtk2.0-dev (>= 2.12.0),
          libgconf2-dev
 Replaces: libgucharmap4-dev,
-          libgucharmap5-dev
+          libgucharmap5-dev,
+          libgucharmap-dev
 Conflicts: libgucharmap4-dev,
-           libgucharmap5-dev
+           libgucharmap5-dev,
+           libgucharmap-dev
 Description: Unicode browser widget library (development headers)
  The libgucharmap library contains a Unicode browser widget; it is
  most prominently used by the "gucharmap" program.  See the package of

Modified: desktop/experimental/gucharmap/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/control.in?rev=17996&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/control.in (original)
+++ desktop/experimental/gucharmap/debian/control.in Fri Dec 26 19:16:16 2008
@@ -42,9 +42,11 @@
          libgtk2.0-dev (>= 2.12.0),
          libgconf2-dev
 Replaces: libgucharmap4-dev,
-          libgucharmap5-dev
+          libgucharmap5-dev,
+          libgucharmap-dev
 Conflicts: libgucharmap4-dev,
-           libgucharmap5-dev
+           libgucharmap5-dev,
+           libgucharmap-dev
 Description: Unicode browser widget library (development headers)
  The libgucharmap library contains a Unicode browser widget; it is
  most prominently used by the "gucharmap" program.  See the package of