Merge branch 'testing'

# By James Meyer (1091) and others
# Via James Meyer (5) and others
* testing: (1148 commits)
  LinHES-config: during install don't kill off lirc.  This keeps the remote active all the way to the finish
  Change version numbers to 8.0  to match the release number. LinHES-conifg LinHES-system mythdb-initial runit-scripts supplemental-web
  LinHES-conifig: mv_install.py  for the last partition don't go all the way to the end.  Gotta leave room for gpt tables.
  xf86-video-ati: xorg ati driver.
  LinHES-config: timezip.py  add syncing up of parental lvl passwords and starting level with MBE.
  LinHES-system: correct the logic for breaking out of the wmctrl loop.   As written it would break out of the inner loop..but not the 60 iteration loop.
  e16_theme_settings:  remove slide-in prop for new windows.   For whatever reason this was preventing mplayer from being positioned correctly for appletrailers.
  LinHES-config, mythinstall:  change  case of hd_pvr and   serial to all lower refs #902
  zilog-firmware:   firmware for TX support of the hdpvr and pvr-150 In general I can't recommend anybody using these transmitters  but including the firmware just in case someone really wants to
  linhes-udev-rules:  added hdprv_lirc rule. All of these lirc rules are limited to exactly one device.  If more then one device is present then only the last device in init will get the symlink
  runit-scripts:  fix logging for igdeamon,   add support to remote init script so that the blaster is always the first device in the chain. added support specificly for hd_pvr
  LinHES-system:   add lh_system_restore and lh_system_backup.  These scripts are called from the mythmenu. refs #900
  iguanair: rebuild with python 2.7
  LinHES-system: msg_daemon.py fix  init and nasty bug related to timeout. In a nutshell timeout wouldn't work unless a msg without a timeout was called first.
  linhes-udev-rules:  add rules for mce,streamzap,serial  lirc devices.
  mythinstall: recompile for matching libs
  mythtv:  latest .25-fixes  and change mythbackup/restore call lh_system_$op   to replace mythbackup/mythrestore.  mythbackup no longer works correctly with the new windowmanager
  linhes-scripts: myth2mp3, myth2x264, myth2xvid: use mythutil to get cutlist
  LinHES-config, supplimental-web:  Fix proxy numbering for Ceton infiniTV
  linhes-system:  add additional stuff to the system backup and also introduced an exclude file. The exclude/include files are locate in /home/mythtv/backup_config/
  ...

5 files changed, 426 insertions, 6 deletions

diff --git a/abs/extra/ttf-droid/PKGBUILD b/abs/extra/ttf-droid/PKGBUILD
index 2df7e2b..3baa9d6 100644
--- a/abs/extra/ttf-droid/PKGBUILD
+++ b/abs/extra/ttf-droid/PKGBUILD
@@ -2,21 +2,35 @@
 # Contributor: Urs Wolfer <uwolfer @ fwo.ch>
 
 pkgname=ttf-droid
-pkgver=20110417
-pkgrel=2
-pkgdesc="A font created by Ascender Corporation for use by the Open Handset Alliance platform, Android."
+pkgver=20121017
+pkgrel=1
+pkgdesc="General-purpose fonts released by Google as part of Android"
 arch=('any')
 license=('apache')
 url="http://code.google.com/android/"
 depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
 install=$pkgname.install
-source=('ftp://ftp.archlinux.org/other/community/ttf-droid/ttf-droid.tar.xz')
-md5sums=('f0dffb54269504a0fdb2c4fe394322ee')
+source=('ftp://ftp.archlinux.org/other/community/ttf-droid/ttf-droid-20121017.tar.xz' 'serif-fontconfig.conf' 'sans-fontconfig.conf' 'sans-mono-fontconfig.conf' 'kufi-fontconfig.conf' )
+md5sums=('0fa20eb63d7d05b23be955777bb52a5d')
 
 package()
 {
-        cd $srcdir/ttf-droid
+        # Install fonts
+        cd $srcdir/google-droid-fonts-$pkgver
         install -d $pkgdir/usr/share/fonts/TTF/ 
         install -m644 *.ttf $pkgdir/usr/share/fonts/TTF/ 
+
+        # Install fontconfig
+        cd $srcdir
+        install -d $pkgdir/etc/fonts/conf.avail/
+        install -m644 sans-fontconfig.conf $pkgdir/etc/fonts/conf.avail/65-$pkgname-sans-fontconfig.conf
+        install -m644 sans-mono-fontconfig.conf $pkgdir/etc/fonts/conf.avail/60-$pkgname-sans-mono-fontconfig.conf
+        install -m644 serif-fontconfig.conf $pkgdir/etc/fonts/conf.avail/65-$pkgname-serif-fontconfig.conf
+        install -m644 kufi-fontconfig.conf $pkgdir/etc/fonts/conf.avail/65-$pkgname-kufi-fontconfig.conf
 }
 
+md5sums=('0fa20eb63d7d05b23be955777bb52a5d'
+         '7db18cf9df70ee41fbab444c80117ec6'
+         '61f59063f84bd1331a91e21ebf86d43d'
+         '7d7787d92e7b5089558a6d68c99813e3'
+         '954a340fc7cb2846826a97d2b752501d')
diff --git a/abs/extra/ttf-droid/kufi-fontconfig.conf b/abs/extra/ttf-droid/kufi-fontconfig.conf
new file mode 100644
index 0000000..4d368eb
--- /dev/null
+++ b/abs/extra/ttf-droid/kufi-fontconfig.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>fantasy</family>
+    <prefer>
+      <family>Droid Arabic Kufi</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Droid Arabic Kufi</family>
+    <default>
+      <family>Droid Sans</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/abs/extra/ttf-droid/sans-fontconfig.conf b/abs/extra/ttf-droid/sans-fontconfig.conf
new file mode 100644
index 0000000..dc9845c
--- /dev/null
+++ b/abs/extra/ttf-droid/sans-fontconfig.conf
@@ -0,0 +1,310 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match target="scan">
+    <test name="family">
+      <string>Droid Sans</string>
+    </test>
+    <edit name="fontversion">
+      <int>12</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Hebrew</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>11</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Hebrew Bold</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans Bold</string>
+    </edit>
+    <edit name="fontversion">
+      <int>11</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Armenian</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>10</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Georgian</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>9</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Ethiopic</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>8</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Ethiopic Bold</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans Bold</string>
+    </edit>
+    <edit name="fontversion">
+      <int>8</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Arabic</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>7</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Devanagari</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>6</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Tamil</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>5</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Tamil Bold</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans Bold</string>
+    </edit>
+    <edit name="fontversion">
+      <int>5</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Thai</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>4</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="lang" compare="not_eq">
+      <string>zh-cn</string>
+    </test>
+    <test name="lang" compare="not_eq">
+      <string>zh-sg</string>
+    </test>
+    <test name="lang" compare="not_eq">
+      <string>zh-hk</string>
+    </test>
+    <test name="lang" compare="not_eq">
+      <string>zh-tw</string>
+    </test>
+    <test name="lang" compare="not_eq">
+      <string>zh</string>
+    </test>
+    <test name="fullname">
+      <string>Droid Sans Japanese</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>3</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Fallback</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>2</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="lang" compare="eq">
+      <string>zh-cn</string>
+    </test>
+    <test name="lang" compare="eq">
+      <string>zh-sg</string>
+    </test>
+    <test name="lang" compare="eq">
+      <string>zh-hk</string>
+    </test>
+    <test name="lang" compare="eq">
+      <string>zh-tw</string>
+    </test>
+    <test name="lang" compare="eq">
+      <string>zh</string>
+    </test>
+    <test name="fullname">
+      <string>Droid Sans Japanese</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>1</int>
+    </edit>
+  </match>
+  <alias binding="same">
+    <family>Droid Sans Arabic</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Armenian</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Devanagari</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Ethiopic</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Fallback</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Georgian</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Hebrew</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Japanese</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Tamil</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Thai</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Droid Sans</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Droid Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/abs/extra/ttf-droid/sans-mono-fontconfig.conf b/abs/extra/ttf-droid/sans-mono-fontconfig.conf
new file mode 100644
index 0000000..1cf8bbc
--- /dev/null
+++ b/abs/extra/ttf-droid/sans-mono-fontconfig.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>Droid Sans Mono</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Droid Sans Mono</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/abs/extra/ttf-droid/serif-fontconfig.conf b/abs/extra/ttf-droid/serif-fontconfig.conf
new file mode 100644
index 0000000..368f361
--- /dev/null
+++ b/abs/extra/ttf-droid/serif-fontconfig.conf
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match target="scan">
+    <test name="family">
+      <string>Droid Serif</string>
+    </test>
+    <edit name="fontversion">
+      <int>2</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Arabic Naskh</string>
+    </test>
+    <edit name="family">
+      <string>Droid Serif</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Serif</string>
+    </edit>
+    <edit name="fontversion">
+      <int>1</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Arabic Naskh Bold</string>
+    </test>
+    <edit name="family">
+      <string>Droid Serif</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Serif Bold</string>
+    </edit>
+    <edit name="fontversion">
+      <int>1</int>
+    </edit>
+  </match>
+  <alias binding="same">
+    <family>Droid Arabic Naskh</family>
+    <accept>
+      <family>Droid Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Naskh Shift Alt</family>
+    <accept>
+      <family>Droid Serif</family>
+    </accept>
+  </alias>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>Droid Serif</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Droid Serif</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+</fontconfig>