drakx, branch 15.63

15.63

2013-09-04T20:55:56+00:00

Revert "stage2: add Feature:Independently_install_desktop_environments"

2013-09-04T20:48:41+00:00

This reverts commit 331e242249bec7f80b303c1d37f3c9c8829988f5.

Conflicts:
	perl-install/NEWS

Merge branch 'master' of git://git.mageia.org/software/drakx

2013-09-04T19:14:20+00:00

Revert "- stage2: add cinnamon to desktop selection"

2013-09-04T19:13:51+00:00

This reverts commit 6b1bd5a9a8771625a783fb1ff794ba06caac0e70.

Conflicts:
	perl-install/install/NEWS

Remove svn support from Makefiles

2013-09-04T18:59:04+00:00

This should leave us with a working tarballs in all cases.

The perl-install/Makefile has been adjusted to do the same as the previous
svn rules (regarding copying Makefiles and running a perl tidyup routine)

The perl-install/install/Makefile has been adjusted to svn export the
rpm srate info from meta-task package subversion. This requires an active
network connection, but should result in the same tarball as before
until this is factored out

Remove link installs for tools in drakx-kbd-mouse-x11 (now managed there)

2013-09-04T18:59:00+00:00

Ignore *.mo files in po/ folders

2013-09-04T18:58:22+00:00

Remove the NEWS item after the reverted commit

2013-09-04T18:56:49+00:00

The fix of the conflicts didn't actually remove the NEWS item added in
in the original commit. As it's now reverted we should remove it from
NEWS also.

fix conflict

2013-09-04T18:34:31+00:00

Revert "stage2: add images for LXDE,E17,Razorqt,MATE"

2013-09-04T16:35:15+00:00

This reverts commit 67bc2a78c587ab4659c0f0e936d2eb98573136aa.

Conflicts:
	perl-install/NEWS