r32886 - in /desktop/unstable/pango1.0/debian: changelog control control.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Mar  9 09:04:53 2012
New Revision: 32886

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32886
Log:
debian/control.in: Drop obsolete Conflicts against pango-libthai.

Modified:
    desktop/unstable/pango1.0/debian/changelog
    desktop/unstable/pango1.0/debian/control
    desktop/unstable/pango1.0/debian/control.in

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=32886&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/changelog [utf-8] Fri Mar  9 09:04:53 2012
@@ -14,7 +14,10 @@
   [ Josselin Mouette ]
   * Drop x-ttcidfont-conf. Closes: #660062.
 
- -- Michael Biebl <biebl at debian.org>  Fri, 16 Dec 2011 21:52:45 +0100
+  [ Michael Biebl ]
+  * debian/control.in: Drop obsolete Conflicts against pango-libthai.
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 09 Mar 2012 10:04:24 +0100
 
 pango1.0 (1.29.4-2) unstable; urgency=low
 

Modified: desktop/unstable/pango1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/control?rev=32886&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/control [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/control [utf-8] Fri Mar  9 09:04:53 2012
@@ -40,7 +40,6 @@
           ttf-arphic-gkai00mp,
           ttf-arphic-bkai00mp
 Breaks: plymouth (<< 0.8.3-19)
-Conflicts: pango-libthai
 Provides: pango1.0-multiarch-modver-1.6.0
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same

Modified: desktop/unstable/pango1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/control.in?rev=32886&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/control.in [utf-8] Fri Mar  9 09:04:53 2012
@@ -40,7 +40,6 @@
           ttf-arphic-gkai00mp,
           ttf-arphic-bkai00mp
 Breaks: plymouth (<< 0.8.3-19)
-Conflicts: pango-libthai
 Provides: @PANGO_MODVER_DEP@
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same