diff -Nru fontconfig-2.11.0/debian/changelog fontconfig-2.11.0/debian/changelog --- fontconfig-2.11.0/debian/changelog 2014-08-20 15:36:05.000000000 +0200 +++ fontconfig-2.11.0/debian/changelog 2014-11-23 18:24:26.000000000 +0100 @@ -1,3 +1,21 @@ +fontconfig (2.11.0-6.3) unstable; urgency=medium + + * Non-maintainer upload. + * Modify fontconfig-config.postinst to not touch the symlinks unless it's + a first install or a reconfigure was issued (Closes: #758973). + + -- Margarita Manterola Sun, 23 Nov 2014 14:10:23 +0100 + +fontconfig (2.11.0-6.2) unstable; urgency=medium + + * Non-maintainer upload to delayed + * Switch to noawait triggers to allow self-triggering; will still need + Breaks from dpkg to resolve this (closes: #768599) + * Add Pre-Depends on dpkg to allow for noawait just in case this gets + backported to squeeze. + + -- Don Armstrong Mon, 10 Nov 2014 11:26:37 -0800 + fontconfig (2.11.0-6.1) unstable; urgency=low * Non-maintainer upload to delayed. diff -Nru fontconfig-2.11.0/debian/control fontconfig-2.11.0/debian/control --- fontconfig-2.11.0/debian/control 2014-08-20 15:32:13.000000000 +0200 +++ fontconfig-2.11.0/debian/control 2014-11-10 20:28:42.000000000 +0100 @@ -18,6 +18,7 @@ Section: fonts Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, fontconfig-config +Pre-Depends: dpkg (>= 1.16.1) Replaces: fontconfig-config (<< 2.5.93-1) Multi-Arch: foreign Description: generic font configuration library - support binaries diff -Nru fontconfig-2.11.0/debian/fontconfig-config.postinst fontconfig-2.11.0/debian/fontconfig-config.postinst --- fontconfig-2.11.0/debian/fontconfig-config.postinst 2014-03-09 22:08:07.000000000 +0100 +++ fontconfig-2.11.0/debian/fontconfig-config.postinst 2014-11-23 14:54:44.000000000 +0100 @@ -7,80 +7,96 @@ CONFAVAIL=/usr/share/fontconfig/conf.avail CONFDIR=/etc/fonts/conf.d -db_get fontconfig/hinting_type -hinting_type="$RET" - -unhinted="10-unhinted.conf" -autohint="10-autohint.conf" - -if [ -h $CONFDIR/$unhinted ]; then - rm $CONFDIR/$unhinted -fi -if [ -h $CONFDIR/$autohint ]; then - rm $CONFDIR/$autohint -fi - -case "$hinting_type" in -"Native") - ;; -"Autohinter") - ln -s $CONFAVAIL/$autohint $CONFDIR/$autohint - ;; -"None") - ln -s $CONFAVAIL/$unhinted $CONFDIR/$unhinted - ;; -esac - - -db_get fontconfig/subpixel_rendering -subpixel_rendering="$RET" - -subpixel="10-sub-pixel-rgb.conf" -no_subpixel="10-no-sub-pixel.conf" - -if [ -h $CONFDIR/$subpixel ]; then - rm $CONFDIR/$subpixel -fi - -if [ -h $CONFDIR/$no_subpixel ]; then - rm $CONFDIR/$no_subpixel -fi - -case "$subpixel_rendering" in -"Automatic") - ;; -"Always") - ln -s $CONFAVAIL/$subpixel $CONFDIR/$subpixel - ;; -"Never") - ln -s $CONFAVAIL/$no_subpixel $CONFDIR/$no_subpixel - ;; -esac - - -db_get fontconfig/enable_bitmaps -enable_bitmaps="$RET" - -yes_bitmaps="70-yes-bitmaps.conf" -no_bitmaps="70-no-bitmaps.conf" - -if [ -h $CONFDIR/$yes_bitmaps ]; then - rm $CONFDIR/$yes_bitmaps -fi - -if [ -h $CONFDIR/$no_bitmaps ]; then - rm $CONFDIR/$no_bitmaps -fi - -case "$enable_bitmaps" in -"true") - ln -s $CONFAVAIL/$yes_bitmaps $CONFDIR/$yes_bitmaps - ;; -*) - ln -s $CONFAVAIL/$no_bitmaps $CONFDIR/$no_bitmaps - ;; -esac - +# Check if this is the initial configuration and not an upgrade of an +# existing configuration +# Usage: if is_initial_configuration "$@"; then ... fi from top level +is_initial_configuration() { + # Plain installation + if [ "$1" = configure ] && [ -z "$2" ]; then + return 0 + fi + # Configuration via dpkg-reconfigure + if [ "$1" = reconfigure ] || [ "$DEBCONF_RECONFIGURE" ]; then + return 0 + fi + return 1 +} + +if is_initial_configuration "$@"; then + db_get fontconfig/hinting_type + hinting_type="$RET" + + unhinted="10-unhinted.conf" + autohint="10-autohint.conf" + + if [ -h $CONFDIR/$unhinted ]; then + rm $CONFDIR/$unhinted + fi + if [ -h $CONFDIR/$autohint ]; then + rm $CONFDIR/$autohint + fi + + case "$hinting_type" in + "Native") + ;; + "Autohinter") + ln -s $CONFAVAIL/$autohint $CONFDIR/$autohint + ;; + "None") + ln -s $CONFAVAIL/$unhinted $CONFDIR/$unhinted + ;; + esac + + + db_get fontconfig/subpixel_rendering + subpixel_rendering="$RET" + + subpixel="10-sub-pixel-rgb.conf" + no_subpixel="10-no-sub-pixel.conf" + + if [ -h $CONFDIR/$subpixel ]; then + rm $CONFDIR/$subpixel + fi + + if [ -h $CONFDIR/$no_subpixel ]; then + rm $CONFDIR/$no_subpixel + fi + + case "$subpixel_rendering" in + "Automatic") + ;; + "Always") + ln -s $CONFAVAIL/$subpixel $CONFDIR/$subpixel + ;; + "Never") + ln -s $CONFAVAIL/$no_subpixel $CONFDIR/$no_subpixel + ;; + esac + + + db_get fontconfig/enable_bitmaps + enable_bitmaps="$RET" + + yes_bitmaps="70-yes-bitmaps.conf" + no_bitmaps="70-no-bitmaps.conf" + + if [ -h $CONFDIR/$yes_bitmaps ]; then + rm $CONFDIR/$yes_bitmaps + fi + + if [ -h $CONFDIR/$no_bitmaps ]; then + rm $CONFDIR/$no_bitmaps + fi + + case "$enable_bitmaps" in + "true") + ln -s $CONFAVAIL/$yes_bitmaps $CONFDIR/$yes_bitmaps + ;; + *) + ln -s $CONFAVAIL/$no_bitmaps $CONFDIR/$no_bitmaps + ;; + esac +fi # end changes applied only for initial config / reconfiguration # Create /usr/local/share/fonts LOCALDIR=/usr/local/share/fonts diff -Nru fontconfig-2.11.0/debian/fontconfig.triggers fontconfig-2.11.0/debian/fontconfig.triggers --- fontconfig-2.11.0/debian/fontconfig.triggers 2013-06-25 20:12:30.000000000 +0200 +++ fontconfig-2.11.0/debian/fontconfig.triggers 2014-11-10 20:28:03.000000000 +0100 @@ -1,3 +1,3 @@ -interest /usr/share/fonts -interest /usr/share/ghostscript/fonts -interest /usr/share/texmf/fonts +interest-noawait /usr/share/fonts +interest-noawait /usr/share/ghostscript/fonts +interest-noawait /usr/share/texmf/fonts