only depend on master
python-pyodbc: bump 3.0.6 -> 3.0.7

Changes:
* Added context manager support to Cursor
* Added padding for driver bugs writing an extra byte
* Cursor.executemany now accepts an iterator or generator.
* Compilation improvements for FreeBSD, Cygwin, and OS/X
* Use SQL_DATA_AT_EXEC instead of SQL_DATA_LEN_AT_EXEC when possible for driver compatibility.
* Row objects can now be pickled.
python-blockdiag: bump 1.2.4 -> 1.3.2

Changes:
  1.3.2 (2013-11-19)
  Fix bugs

  1.3.1 (2013-10-22)
  Fix bugs

  1.3.0 (2013-10-05)
  Support python 3.2 and 3.3 (thanks to @masayuko)
  Drop supports for python 2.4 and 2.5
  Replace dependency: PIL -> Pillow

(The test phase still fails for one test, so continue having it disabled.)
python-actdiag: bump 0.4.3 -> 0.5.1

Changes:
  0.5.1 (2013-10-22)
  Fix bugs

  0.5.0 (2013-10-05)
  Support python 3.2 and 3.3 (thanks to @masayuko)
  Drop supports for python 2.4 and 2.5
  Replace dependency: PIL -> Pillow

(The test phase still fails for one test, so continue having it disabled.)
python-nwdiag: bump 0.9.4 -> 1.0.0

Changes:
  1.0.0 (2013-10-05)
  Support python 3.2 and 3.3 (thanks to @masayuko)
  Drop supports for python 2.4 and 2.5
  Replace dependency: PIL -> Pillow

(The test phase still fails, so continue having it disabled.)
python-seqdiag: bump 0.8.2 -> 0.9.0

Changes:
  0.9.0 (2013-10-05)
  Support python 3.2 and 3.3 (thanks to @masayuko)
  Drop supports for python 2.4 and 2.5
  Replace dependency: PIL -> Pillow

(The test phase still fails, so continue having it disabled.)
solfege: update 3.22 -> 3.22.2 (latest stable)

Changes:

Solfege 3.22.2, October 6, 2013
* Updated Esperanto, Portugese and Turkish translations to the users manual
* Updated Spannish and Turkish messages
* distribute solfege/tests/lesson-files/*
* help/C/scales/modes.html are never translated. So we must link to the
  C-locale file in every translation.
* gettext tweaks to make the test suite work both when run as "test.py" and
  "test.py test_lessonfile". There is still something wrong because we have to
  disable the test to run debuild
* distribute solfege/tests/lib/* and solfege/test/include/*

Solfege 3.22.1, September 16, 2013
* Adjust some of the short interval names used when selecting intervals to
  practise: u->P1 4->P4, 5->P5, tt->TT, p11->P11, p12->P12, tt8->d12. Added long
  name for intervals from Eleventh to Double Octave.
* Fix the bug where we could not select the Default profile
* Updated Esperanto, Spannish, Polish, Turkish, Vietnamese, Norwegian bokmål,
  Brazilian Portugese and Vietnamese translations.
solfege: refactor meta attributes
pythonPackages.goobook: add expression
Fix nix-prefetch-git

The nix-prefect git script was broken when trying to parse certain
groups of submodules. This patch fixes the url detection for submodule
repositories to use the more reliable `git config` commands.
newsbeuter-dev: update to latest master
Adding freetype to ffmpeg. To use the drawtext filter.
Updating amrnb to the latest version.
Add alienfx. Only tested with M11x Made some corrections. Added meta-data Use more of the original makefile 2 space indent
alienfx: also build on i686
MyPaint, fix impurity: add hicolor_icon_theme wrapper to ensure MyPaint can start

MyPaint fails to find its own icons and refuses to start if another
icon theme is not available on the system. Running
gtk-update-icon-cache on MyPaint's share/icons/hicolor folder did not
help, and setting the XDG_DATA_DIRS to point to MyPaint's icons also
didn't work.

https://gna.org/bugs/?18460

Thanks to Kim Simmons for reporting this and helping to debug.
Merge branch 'master' into refs/top-bases/experimental/php

* master:
  MyPaint, fix impurity: add hicolor_icon_theme wrapper to ensure MyPaint can start
  alienfx: also build on i686
  Add alienfx. Only tested with M11x Made some corrections. Added meta-data Use more of the original makefile 2 space indent
  Updating amrnb to the latest version.
  Adding freetype to ffmpeg. To use the drawtext filter.
  newsbeuter-dev: update to latest master
  Fix nix-prefetch-git
  pythonPackages.goobook: add expression
  solfege: refactor meta attributes
  solfege: update 3.22 -> 3.22.2 (latest stable)
  python-seqdiag: bump 0.8.2 -> 0.9.0
  python-nwdiag: bump 0.9.4 -> 1.0.0
  python-actdiag: bump 0.4.3 -> 0.5.1
  python-blockdiag: bump 1.2.4 -> 1.3.2
  python-pyodbc: bump 3.0.6 -> 3.0.7
Merge remote-tracking branch 'refs/remotes/gh/experimental/php' into HEAD

* refs/remotes/gh/experimental/php: (55 commits)
  php sort options alphabetically, follow upstream updates
  improve message
  koellner phonetic will be an extra topic branch
  merge nixos code
  php sendmail path patch
  use true_version, change url
  use .x - never forgett to update those numbers again
  updating php
  interactive fix
  fix2
  fixes
  adding koellner-phoenetik extension
  use --with-jpeg-dir otherwise PHP cannot create jpegs from string
  use gd shared always
  forgott to change hash
  follow upstream gd change
  improve documentation
  fix
  add upstream changes, put options in order of master
  hash patch was merged upstream (hash -> hashString)
  ...
Merge commit '5139ae755f7dfd461e80e9ada3fa05b2d471bb87' into experimental/php

* commit '5139ae755f7dfd461e80e9ada3fa05b2d471bb87': (329 commits)
  MyPaint, fix impurity: add hicolor_icon_theme wrapper to ensure MyPaint can start
  alienfx: also build on i686
  Add alienfx. Only tested with M11x Made some corrections. Added meta-data Use more of the original makefile 2 space indent
  Updating amrnb to the latest version.
  Adding freetype to ffmpeg. To use the drawtext filter.
  newsbeuter-dev: update to latest master
  Fix nix-prefetch-git
  pythonPackages.goobook: add expression
  solfege: refactor meta attributes
  solfege: update 3.22 -> 3.22.2 (latest stable)
  python-seqdiag: bump 0.8.2 -> 0.9.0
  python-nwdiag: bump 0.9.4 -> 1.0.0
  python-actdiag: bump 0.4.3 -> 0.5.1
  python-blockdiag: bump 1.2.4 -> 1.3.2
  python-pyodbc: bump 3.0.6 -> 3.0.7
  Add automake 1.14
  MyPaint: fix the mypaint script to use the correct python instead of calling env
  TuxOnIce: Add a 3.10 linux kernel with the TuxOnIce hibernation patch
  xmobar: add support for wireless
  varnish: update to 3.0.4
  ...
follow upstream, must not use mkMerge on environment because environment.check is read now