diff -u fontconfig-2.6.0/conf.d/Makefile.am fontconfig-2.6.0/conf.d/Makefile.am --- fontconfig-2.6.0/conf.d/Makefile.am +++ fontconfig-2.6.0/conf.d/Makefile.am @@ -47,6 +47,8 @@ 49-sansserif.conf \ 50-user.conf \ 51-local.conf \ + 52-languageselector.conf \ + 53-monospace-lcd-filter.conf \ 60-latin.conf \ 65-fonts-persian.conf \ 65-khmer.conf \ @@ -73,8 +75,6 @@ 51-local.conf \ 52-languageselector.conf \ 53-monospace-lcd-filter.conf \ - 52-languageselector.conf \ - 53-monospace-lcd-filter.conf \ 60-latin.conf \ 65-fonts-persian.conf \ 65-nonlatin.conf \ diff -u fontconfig-2.6.0/conf.d/Makefile.in fontconfig-2.6.0/conf.d/Makefile.in --- fontconfig-2.6.0/conf.d/Makefile.in +++ fontconfig-2.6.0/conf.d/Makefile.in @@ -264,6 +264,8 @@ 49-sansserif.conf \ 50-user.conf \ 51-local.conf \ + 52-languageselector.conf \ + 53-monospace-lcd-filter.conf \ 60-latin.conf \ 65-fonts-persian.conf \ 65-khmer.conf \ @@ -290,8 +292,6 @@ 51-local.conf \ 52-languageselector.conf \ 53-monospace-lcd-filter.conf \ - 52-languageselector.conf \ - 53-monospace-lcd-filter.conf \ 60-latin.conf \ 65-fonts-persian.conf \ 65-nonlatin.conf \ diff -u fontconfig-2.6.0/debian/changelog fontconfig-2.6.0/debian/changelog --- fontconfig-2.6.0/debian/changelog +++ fontconfig-2.6.0/debian/changelog @@ -1,3 +1,11 @@ +fontconfig (2.6.0-1ubuntu2) intrepid; urgency=low + + * fixed conf.d/Makefile.am and conf.d/Makefile.in to really install + 52-languageselector.conf and 53-monospace-lcd-filter.conf + (LP: 243130) + + -- Arne Goetje Thu, 26 Jun 2008 17:31:33 +0800 + fontconfig (2.6.0-1ubuntu1) intrepid; urgency=low * Merge with Debian; remaining changes: reverted: --- fontconfig-2.6.0/debian/.gitignore +++ fontconfig-2.6.0.orig/debian/.gitignore @@ -1,12 +0,0 @@ -*.debhelper -*.substvars -fontconfig-config -fontconfig-udeb -libfontconfig1 -libfontconfig1-dev -libfontconfig1-dbg -stamp-* -tmp -fontconfig -files - reverted: --- fontconfig-2.6.0/.gitignore +++ fontconfig-2.6.0.orig/.gitignore @@ -1,3 +0,0 @@ -/* -!debian -!.gitignore