Bug#348806: diff for 1.2.0-5.1 NMU

[Steinar H. Gunderson]

Package: m17n-lib
Version: 1.2.0-5
Severity: normal
Tags: patch

Hi,

Attached is the diff for my m17n-lib 1.2.0-5.1 NMU.

-- 
Homepage: http://www.sesse.net/

diff -u m17n-lib-1.2.0/debian/control m17n-lib-1.2.0/debian/control
--- m17n-lib-1.2.0/debian/control
+++ m17n-lib-1.2.0/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Hidetaka Iwai <[EMAIL PROTECTED]>
 Uploaders: Masahito Omote <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), cdbs, libfreetype6-dev, libfribidi-dev, 
xlibs-dev, libxaw7-dev, libotf-dev (>= 0.9.2), libxml2-dev, libanthy-dev, 
zlib1g-dev, libfontconfig1-dev, libgd2-xpm-dev
+Build-Depends: debhelper (>= 4.0.0), cdbs, libfreetype6-dev, libfribidi-dev, 
libice-dev, libsm-dev, libx11-dev, libxt-dev, libxaw7-dev, libotf-dev (>= 
0.9.2), libxml2-dev, libanthy-dev, zlib1g-dev, libfontconfig1-dev, 
libgd2-xpm-dev
 Standards-Version: 3.6.2
 
 Package: libm17n-0
diff -u m17n-lib-1.2.0/debian/changelog m17n-lib-1.2.0/debian/changelog
--- m17n-lib-1.2.0/debian/changelog
+++ m17n-lib-1.2.0/debian/changelog
@@ -1,3 +1,13 @@
+m17n-lib (1.2.0-5.1) unstable; urgency=low
+
+  * Non-Maintainer Upload.
+  * Handle fonts with no "family"; patch from Brendan O'Dea.
+    (Closes: #325528)
+  * Replace xlibs-dev build-dependency with explicit build-dependencies on
+    the required libraries. (Closes: #347002)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]>  Thu, 19 Jan 2006 02:09:17 +0100
+
 m17n-lib (1.2.0-5) unstable; urgency=high
 
   * debian/control: Added build-dependencies on libgd2-xpm-dev.  This
only in patch2:
unchanged:
--- m17n-lib-1.2.0.orig/src/m17n-X.c
+++ m17n-lib-1.2.0/src/m17n-X.c
@@ -487,6 +487,9 @@
        char *base_end;
        int base_len;
        int fields;
+
+       if (!family)
+         continue;
        
        if (p && MPLIST_KEY (p) != family)
          p = mplist_find_by_key (plist, family);