Diffusion Craft 9ec941c5ef1d

Merge branch 'python3' into frameworks
9ec941c5ef1d
Actions

Authored by sengels on Jan 12 2012, 9:45 PM.

Description

Merge branch 'python3' into frameworks

Conflicts:
portage/kde/kdelibs/kdelibs-20110130.py

Details

Committed

sengels

Jan 12 2012, 9:45 PM

Parents

R138:162fd30e761b: Merge branch 'python3' into frameworks
R138:51f1fb5053a1: make gpgme 1.3.1 the default target (cherry picked from commit…

Branches

Unknown

Tags

Unknown

sengels committed R138:9ec941c5ef1d: Merge branch 'python3' into frameworks (authored by sengels).Jan 12 2012, 9:45 PM

Merged Changes

Commit	Author	Details	Committed
51f1fb5053a1	sengels	make gpgme 1.3.1 the default target (cherry picked from commit…	Jan 12 2012
82f87046fd92	sengels	update assuan2 to newest release (cherry picked from commit…	Jan 12 2012
8e6d95bd8afa	sengels	fix import error	Jan 12 2012
d9ad0c199565	sengels	use trunk or master instead of 4.8	Jan 12 2012
e69214b14f96	sengels	update kdeutils for 4.8	Jan 12 2012
a698eac9245d	sengels	fix kdegraphics and add 4.8 (cherry picked from commit…	Jan 12 2012
f8c3ac8552fd	sengels	add more kde packages, only kdeutils and kdegraphics are missing (for 4.8)…	Jan 12 2012
6c313619a087	sengels	fix kdelibs and add 4.8 (cherry picked from commit…	Jan 12 2012
bce7646e3a70	sengels	fix kdeedu and add 4.8 (cherry picked from commit…	Jan 12 2012
79be438c06eb	sengels	fix kdemultimedia and add 4.8 (cherry picked from commit…	Jan 12 2012
cb592db69768	sengels	update kde4-l10n and add 4.8 (cherry picked from commit…	Jan 12 2012
a7b9a4ed626f	sengels	update kde-baseapps and add 4.8 (cherry picked from commit…	Jan 12 2012
9282d659a7f5	sengels	update kactivities and add 4.8 packages (cherry picked from commit…	Jan 12 2012
c88aa141564e	Patrick von Reth	wtf	Jan 11 2012
790f41931d22	Patrick von Reth	fix	Jan 11 2012
7234ed7a71e2	Patrick von Reth	fix	Jan 11 2012
e26e15a17ba3	Patrick von Reth	fixed encode..	Jan 11 2012
026d7e7e029c	Patrick von Reth	rebuild boost-python	Jan 11 2012
53d3d6a23dad	Patrick von Reth	str fix	Jan 11 2012
4de0b6f9b761	Patrick von Reth	fixed url	Jan 11 2012
33f0ced19b8d	Patrick von Reth	build new target	Jan 11 2012
c078dc97f7bb	Patrick von Reth	updated dbus	Jan 11 2012
d7da4501fc5b	Patrick von Reth	moved icon, register with icon	Jan 11 2012
cac0721e68a9	Patrick von Reth	removed unused logo	Jan 11 2012
de1055189edf	Patrick von Reth	added support for notification backends	Jan 11 2012
dc7580b98062	Patrick von Reth	target name changed again	Jan 11 2012

Changes (115)

		Path
A	(dir)	bin/Notifier/
A	(dir)	bin/Notifier/Backends/
A		bin/Notifier/Backends/Snarl.py
A		bin/Notifier/Backends/__init__.py
A	(dir)	bin/Notifier/Libs/
A		bin/Notifier/Libs/__init__.py
A		bin/Notifier/Libs/pysnp.py
A		bin/Notifier/NotificationInterface.py
A		bin/Notifier/NotificationLoader.py
A		bin/Notifier/__init__.py
M		bin/emerge.py
M		bin/portage.py
M		bin/utils.py
M		portage/kde/kactivities/kactivities-20111102.py
M		portage/kde/kde-baseapps/kde-baseapps-20110130.py
P		portage/kde/kde-runtime/kde-runtime-20110130.py Copied from portage/kde/kdemultimedia/kdemultimedia-20080202.py
P		portage/kde/kde-workspace/kde-workspace-20110130.py Copied from portage/kde/kdeedu/kbruch/kbruch-20110621.py
M		portage/kde/kde4-l10n/kde4-l10n-20090815.py
P		portage/kde/kdeedu/blinken/blinken-20110621.py Copied from portage/kde/kdeedu/kig/kig-20110621.py
P		portage/kde/kdeedu/cantor/cantor-20110621.py Copied from portage/kde/kdeedu/kig/kig-20110621.py
P		portage/kde/kdeedu/kalgebra/kalgebra-20110621.py Copied from portage/kde/kdeedu/kig/kig-20110621.py
P		portage/kde/kdeedu/kalzium/kalzium-20110621.py Copied from portage/kde/kdeedu/parley/parley-20110621.py
M		portage/kde/kdeedu/kanagram/kanagram-20110621.py
P		portage/kde/kdeedu/kbruch/kbruch-20110621.py Copied to portage/kde/kde-workspace/kde-workspace-20110130.py
M		portage/kde/kdeedu/kdeedu-20080202.py
M		portage/kde/kdeedu/kgeography/kgeography-20110621.py
M		portage/kde/kdeedu/khangman/khangman-20110621.py
P		portage/kde/kdeedu/kig/kig-20110621.py Copied to multiple locations: portage/kde/kdeedu/blinken/blinken-20110621.py portage/kde/kdeedu/cantor/cantor-20110621.py portage/kde/kdeedu/kalgebra/kalgebra-20110621.py
M		portage/kde/kdeedu/kiten/kiten-20110621.py
M		portage/kde/kdeedu/klettres/klettres-20110621.py
M		portage/kde/kdeedu/kmplot/kmplot-20110621.py
M		portage/kde/kdeedu/kstars/kstars-20110621.py
M		portage/kde/kdeedu/ktouch/ktouch-20110621.py
M		portage/kde/kdeedu/kturtle/kturtle-20110621.py
M		portage/kde/kdeedu/kwordquiz/kwordquiz-20110621.py
M		portage/kde/kdeedu/libkdeedu/libkdeedu-20110621.py
M		portage/kde/kdeedu/marble/marble-20110621.py
P		portage/kde/kdeedu/parley/parley-20110621.py Copied to portage/kde/kdeedu/kalzium/kalzium-20110621.py
M		portage/kde/kdeedu/rocs/rocs-20110621.py
M		portage/kde/kdeedu/step/step-20110621.py
P		portage/kde/kdegames/kdegames-20080202.py Copied to portage/kde/kdesdk/kdesdk-20080202.py
M		portage/kde/kdegraphics/gwenview/gwenview-20110627.py
M		portage/kde/kdegraphics/kamera/kamera-20110627.py
M		portage/kde/kdegraphics/kcolorchooser/kcolorchooser-20110627.py
D		portage/kde/kdegraphics/kdegraphics-package.xml
M		portage/kde/kdegraphics/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-20110627.py
M		portage/kde/kdegraphics/kdegraphics-thumbnailers/kdegraphics-thumbnailers-20110627.py
M		portage/kde/kdegraphics/kolourpaint/kolourpaint-20110627.py
M		portage/kde/kdegraphics/kruler/kruler-20110627.py
M		portage/kde/kdegraphics/ksaneplugin/ksaneplugin-20110627.py
P		portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py Copied to multiple locations: portage/kde/kdepim/kdepim-20080202.py portage/kde/kdeutils/ark/ark-20120112.py portage/kde/kdeutils/filelight/filelight-20120112.py portage/kde/kdeutils/kcalc/kcalc-20120112.py portage/kde/kdeutils/kcharselect/kcharselect-20120112.py portage/kde/kdeutils/kdiskfree/kdiskfree-20120112.py portage/kde/kdeutils/kfloppy/kfloppy-20120112.py portage/kde/kdeutils/kgpg/kgpg-20120112.py portage/kde/kdeutils/kremotecontrol/kremotecontrol-20120112.py portage/kde/kdeutils/ksecretsservice/ksecretsservice-20120112.py portage/kde/kdeutils/ktimer/ktimer-20120112.py portage/kde/kdeutils/kwallet/kwallet-20120112.py portage/kde/kdeutils/printer-applet/printer-applet-20120112.py portage/kde/kdeutils/superkaramba/superkaramba-20120112.py portage/kde/kdeutils/sweeper/sweeper-20120112.py
M		portage/kde/kdegraphics/libkdcraw/libkdcraw-20110627.py
M		portage/kde/kdegraphics/libkexiv2/libkexiv2-20110627.py
M		portage/kde/kdegraphics/libkipi/libkipi-20110627.py
M		portage/kde/kdegraphics/libksane/libksane-20110627.py
M		portage/kde/kdegraphics/mobipocket/mobipocket-20110627.py
M		portage/kde/kdegraphics/okular/okular-20110627.py
M		portage/kde/kdegraphics/svgpart/svgpart-20110627.py
M		portage/kde/kdelibs/kdelibs-20110130.py
P		portage/kde/kdemultimedia/kdemultimedia-20080202.py Copied to portage/kde/kde-runtime/kde-runtime-20110130.py
M		portage/kde/kdenetwork/kdenetwork-20080202.py
M		portage/kde/kdepim-runtime/kdepim-runtime-20101222.py
P		portage/kde/kdepim/kdepim-20080202.py Copied from portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
D		portage/kde/kdepimlibs/kdepimlibs-20080202.py
M		portage/kde/kdepimlibs/kdepimlibs-20110129.py
M		portage/kde/kdeplasma-addons/kdeplasma-addons-20080717.py
P		portage/kde/kdesdk/kdesdk-20080202.py Copied from portage/kde/kdegames/kdegames-20080202.py
M		portage/kde/kdetoys/kdetoys-20080202.py
A	(dir)	portage/kde/kdeutils/ark/
P		portage/kde/kdeutils/ark/ark-20120112.py Copied from portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
A	(dir)	portage/kde/kdeutils/filelight/
P		portage/kde/kdeutils/filelight/filelight-20120112.py Copied from portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
A	(dir)	portage/kde/kdeutils/kcalc/
P		portage/kde/kdeutils/kcalc/kcalc-20120112.py Copied from portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
A	(dir)	portage/kde/kdeutils/kcharselect/
P		portage/kde/kdeutils/kcharselect/kcharselect-20120112.py Copied from portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
D		portage/kde/kdeutils/kdeutils-20080202.py
A		portage/kde/kdeutils/kdeutils-20120112.py
A	(dir)	portage/kde/kdeutils/kdiskfree/
P		portage/kde/kdeutils/kdiskfree/kdiskfree-20120112.py Copied from portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
A	(dir)	portage/kde/kdeutils/kfloppy/
P		portage/kde/kdeutils/kfloppy/kfloppy-20120112.py Copied from portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
A	(dir)	portage/kde/kdeutils/kgpg/
P		portage/kde/kdeutils/kgpg/kgpg-20120112.py Copied from portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
A	(dir)	portage/kde/kdeutils/kremotecontrol/
P		portage/kde/kdeutils/kremotecontrol/kremotecontrol-20120112.py Copied from portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
A	(dir)	portage/kde/kdeutils/ksecretsservice/
P		portage/kde/kdeutils/ksecretsservice/ksecretsservice-20120112.py Copied from portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
A	(dir)	portage/kde/kdeutils/ktimer/
P		portage/kde/kdeutils/ktimer/ktimer-20120112.py Copied from portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
A	(dir)	portage/kde/kdeutils/kwallet/
P		portage/kde/kdeutils/kwallet/kwallet-20120112.py Copied from portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
A	(dir)	portage/kde/kdeutils/printer-applet/
P		portage/kde/kdeutils/printer-applet/printer-applet-20120112.py Copied from portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
A	(dir)	portage/kde/kdeutils/superkaramba/
P		portage/kde/kdeutils/superkaramba/superkaramba-20120112.py Copied from portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
A	(dir)	portage/kde/kdeutils/sweeper/
P		portage/kde/kdeutils/sweeper/sweeper-20120112.py Copied from portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
D		portage/kde/kdewebdev
D		portage/kde/kdewebdev/kdewebdev-20080202.py
D		portage/kde/kdewebdev/post-install-bin.cmd
M		portage/testing/vlc/vlc-1.1.11.py
V		portage/win32libs-sources/assuan2-src/{assuan2-src-2.0.0.py → assuan2-src-2.0.3.py}
V		portage/win32libs-sources/assuan2-src/{assuan2-src-2.0.3.py ← assuan2-src-2.0.0.py}
A		portage/win32libs-sources/assuan2-src/libassuan-2.0.3-cmake.diff
V		portage/win32libs-sources/boost-src/boost-python-src/{boost-python-src-1.48.0-1-20110312.py ← boost-python-src-1.48.0-20110312.py}
V		portage/win32libs-sources/boost-src/boost-python-src/{boost-python-src-1.48.0-20110312.py → boost-python-src-1.48.0-1-20110312.py}
V		portage/win32libs-sources/dbus-src/{dbus-src-1.4.10-20110302.py → dbus-src-1.4.16-20110302.py}
V		portage/win32libs-sources/dbus-src/{dbus-src-1.4.16-20110302.py ← dbus-src-1.4.10-20110302.py}
M		portage/win32libs-sources/gpgme-src/gpgme-1.3.1-cmake.diff
V		portage/win32libs-sources/gpgme-src/{gpgme-src-1.3.1.py ← gpgme-src-1510-3.py}
V		portage/win32libs-sources/gpgme-src/{gpgme-src-1510-3.py → gpgme-src-1.3.1.py}
M		server/notifications.py
M		server/package.py
M		server/serverconfig/packagelist-win32libs.txt