Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

2 files changed, 0 insertions, 71 deletions

diff --git a/packages/albumshaper/albumshaper_2.1.bb b/packages/albumshaper/albumshaper_2.1.bb
deleted file mode 100644
index 978df1eda9..0000000000
--- a/packages/albumshaper/albumshaper_2.1.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Album Shaper strives to be the most friendly, easy to use, open source application for \
-organizing, annotating, framing, enhancing, stylizing, and sharing your digital photos. \
-Album Shaper embraces open formats like XML, JPEG, and XSLT, while supporting Windows, Mac OS X, and Unix \
-users who speak a multitude of languages around the world."
-HOMEPAGE = "http://albumshaper.sourceforge.net"
-AUTHOR = "Will Stokes"
-LICENSE = "GPL"
-DEPENDS = "libxml2 libxslt jpeg"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/albumshaper/albumshaper_${PV}.tar.bz2 \
-           file://fixpaths.patch;patch=1"
-S = "${WORKDIR}/albumshaper_2.1_src"
-
-inherit qmake qt3x11
-
-do_install() {
-	oe_runmake install INSTALL_ROOT="${D}"
-}
diff --git a/packages/albumshaper/files/fixpaths.patch b/packages/albumshaper/files/fixpaths.patch
deleted file mode 100644
index 34ca2e3804..0000000000
--- a/packages/albumshaper/files/fixpaths.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- albumshaper_2.1_src/Makefile~fixpaths
-+++ albumshaper_2.1_src/Makefile
-@@ -1,6 +1,6 @@
- #############################################################################
- # Makefile for building: bin/AlbumShaper.bin
--# Generated by qmake (1.07a) (Qt 3.3.5) on: Tue May  9 12:09:27 2006
-+# Generated by qmake (1.07a) (Qt 3.3.5) on: Tue May  9 13:58:45 2006
- # Project:  AlbumShaper.pro
- # Template: app
- # Command: $(QMAKE) -spec /local/pkg/oe/c7x0/tmp/staging/i686-linux/share/qmake/linux-oe-g++ -after  "CONFIG+=thread" -o Makefile AlbumShaper.pro
-@@ -12,14 +12,14 @@
- CXX      = $(OE_QMAKE_CXX)
- LEX      = flex
- YACC     = yacc
--CFLAGS   = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/usr/include/libxml2 -I/usr/include/libxml2 -Os -D_REENTRANT  -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
--CXXFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/usr/include/libxml2 -I/usr/include/libxml2 -Os -D_REENTRANT  -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-+CFLAGS   = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -Os -D_REENTRANT  -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-+CXXFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -Os -D_REENTRANT  -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
- LEXFLAGS = 
- YACCFLAGS= -d
- INCPATH  = -I/local/pkg/oe/c7x0/tmp/staging/i686-linux/share/qmake/linux-oe-g++ -I. -I$(OE_QMAKE_INCDIR_QT) -Itmp/
- LINK     = $(OE_QMAKE_LINK)
- LFLAGS   = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA) -s  -Wl,-rpath-link,$(OE_QMAKE_LIBDIR_QT)
--LIBS     = $(SUBLIBS) -L$(OE_QMAKE_LIBDIR_QT) $(LIBS_EXTRA) -ljpeg -L/usr/lib -lxslt -lxml2 -lz -lm -lxml2 -lz -lm -lxslt -lxml2 -ljpeg -l$(OE_QMAKE_LIBS_QT)-mt $(OE_QMAKE_LIBS_X11) -lpthread
-+LIBS     = $(SUBLIBS) -L$(OE_QMAKE_LIBDIR_QT) $(LIBS_EXTRA) -ljpeg -L/local/pkg/oe/c7x0/tmp/staging/arm-linux/lib -lxslt -lxml2 -lz -lm -L/local/pkg/oe/c7x0/tmp/staging/arm-linux/lib -lxml2 -lz -lm -lxslt -lxml2 -ljpeg -l$(OE_QMAKE_LIBS_QT)-mt $(OE_QMAKE_LIBS_X11) -lpthread
- AR       = $(OE_QMAKE_AR) cqs
- RANLIB   = 
- MOC      = $(OE_QMAKE_MOC)
-@@ -1377,7 +1377,7 @@
- 
- install_scripts: all 
- 	@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/bin/" || $(MKDIR) "$(INSTALL_ROOT)/usr/bin/"
--	cp -f bin/AlbumShaper /usr/bin/AlbumShaper;
-+	cp -f bin/AlbumShaper $(INSTALL_ROOT)//usr/bin/AlbumShaper;
- 
- 
- install: install_target install_images install_text install_themes install_translations install_xmlConversion install_scripts  
---- albumshaper_2.1_src/AlbumShaper.pro~fixpaths
-+++ albumshaper_2.1_src/AlbumShaper.pro
-@@ -272,7 +272,7 @@
- 
- #--------- Launcher Script (Linux/FreeBSD) ------------
- !mac:unix:scripts.path = $${BIN_DIR}
--!mac:unix:scripts.commands = cp -f bin/AlbumShaper $${BIN_DIR}/AlbumShaper;
-+!mac:unix:scripts.commands = cp -f bin/AlbumShaper $(INSTALL_ROOT)/$${BIN_DIR}/AlbumShaper;
- 
- 
- #===========================================================================================