Merge branch 'master' into core-updates Conflicts: gnu/packages/commencement.scm gnu/packages/xml.scm
gnu: icedtea7: Bootstrap with GCJ. * gnu/packages/java.scm (icedtea7): Bootstrap with GCJ rather than compile with IcedTea6.
Merge branch 'master' into core-updates
Merge branch 'master' into gtk-rebuild Conflicts: gnu/packages/gtk.scm
gnu: icedtea6: Add target-dependent include directory to CPATH. * gnu/packages/java.scm (gcj-4.8)[arguments]: Add target-dependent GCJ include directory to CPATH environment variable.
Merge branch 'master' into core-updates
gnu: Add icedtea7. * gnu/packages/java.scm (icedtea7): New variable.
gnu: icedtea6: Split test fixing phases. * gnu/packages/java.scm (icedtea6)[arguments]: Split phase 'fix-tests into three phases 'fix-test-framework, 'fix-hotspot-tests, and 'fix-jdk-tests.
Merge branch 'master' into core-updates.
gnu: Add SWT. * gnu/packages/java.scm (swt): New variable.
Merge branch 'core-updates'
Merge branch 'master' into core-updates Conflicts: gnu-system.am gnu/packages/gstreamer.scm
gnu: icedtea6: Update to 1.13.7. * gnu/packages/java.scm (icedtea6): Update to version 1.13.7.
gnu: Disable RUNPATH validation for packages that use $ORIGIN. * gnu/packages/haskell.scm (ghc)[arguments]: Add #:validate-runpath?. * gnu/packages/julia.scm (julia)[arguments]: Likewise. * gnu/packages/java.scm (icedtea6)[arguments]: Likewise.
Merge branch 'master' into core-updates
gnu: icedtea6: remove commented substitution. * gnu/packages/java.scm (icedtea6): Remove commented substitution.
gnu: icedtea6: Do not set CC and LD_LIBRARY_PATH. * gnu/packages/java.scm (icedtea6)[arguments]: Do not set CC and LD_LIBRARY_PATH variables.
gnu: icedtea6: Rename ‘set-paths’ phase to ‘set-additional-paths’ * gnu/packages/java.scm (icedtea6)[arguments]: Rename ‘set-paths’ phase to ‘set-additional-paths’.
gnu: icedtea6: patch patches in separate build phase. * gnu/packages/java.scm (icedtea6)[arguments]: Move patching of patches from ‘patch-paths’ to new ‘patch-patches’ phase.
gnu: icedtea6: patch hardcoded objcopy path. * gnu/packages/java.scm (icedtea6)[arguments]: patch Makefile to override DEF_OBJCOPY variable definition.