2 files changed, 8 insertions, 56 deletions
diff --git a/packages/puzzles/puzzles_r6712.bb b/packages/puzzles/puzzles_r6712.bb
deleted file mode 100644
index 41a6e808ab..0000000000
--- a/packages/puzzles/puzzles_r6712.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-
-DEPENDS = "gtk+ perl-native"
-
-SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=6712 \
-           file://game.png"
-
-S = "${WORKDIR}/puzzles/"
-
-do_configure() {
-        cd ${S} && perl mkfiles.pl
-}
-
-do_compile_prepend = " \
-        export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR}/pkg-config gtk+-2.0 --libs`'; \
-	export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags`'; "
-
-FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps"
-
-do_install () {
-    export prefix=${D}
-    export DESTDIR=${D}
-    install -d ${D}/${prefix}
-    install -d ${D}/${prefix}/games
-    oe_runmake install
-    
-    install -d ${D}/${datadir}
-    install -d ${D}/${datadir}/applications
-    install -d ${D}/${datadir}/pixmaps
-
-    install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps
-
-    cd ${D}/${prefix}/games 
-    for prog in *; do
-	if [ -x $prog ]; then
-	    echo "making ${D}/${datadir}/applications/$prog.desktop"
-	    cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
-[Desktop Entry]
-Encoding=UTF-8
-Name=$prog
-Exec=${prefix}/games/$prog
-Icon=game.png
-Terminal=false
-Type=Application
-Categories=Game
-StartupNotify=true
-SingleInstance=true
-STOP
-        fi
-    done
-}
diff --git a/packages/puzzles/puzzles_r6505.bb b/packages/puzzles/puzzles_r6727.bb
index c3725ac8f7..f8ffcb7d01 100644
--- a/packages/puzzles/puzzles_r6505.bb
+++ b/packages/puzzles/puzzles_r6727.bb
@@ -10,19 +10,21 @@ do_compile_prepend = " \
 	export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags`'; "
 
 FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps"
+FILES_${PN}-dbg += "${prefix}/games/.debug"
 
 do_install () {
+    rm -rf ${D}/*
     export prefix=${D}
     export DESTDIR=${D}
-    install -d ${D}/${prefix}
-    install -d ${D}/${prefix}/games
+    install -d ${D}/${prefix}/
+    install -d ${D}/${prefix}/games/
     oe_runmake install
     
-    install -d ${D}/${datadir}
-    install -d ${D}/${datadir}/applications
-    install -d ${D}/${datadir}/pixmaps
+    install -d ${D}/${datadir}/
+    install -d ${D}/${datadir}/applications/
+    install -d ${D}/${datadir}/pixmaps/
 
-    install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps
+    install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps/
 
     cd ${D}/${prefix}/games 
     for prog in *; do