From 29d6678fd546377459ef75cf54abeef5b969b5cf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 27 Aug 2010 15:14:24 +0100 Subject: Major layout change to the packages directory Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie --- .../matchbox-wm/matchbox-wm/configure_fix.patch | 13 ------- meta/packages/matchbox-wm/matchbox-wm/gconf-2.m4 | 39 ------------------- meta/packages/matchbox-wm/matchbox-wm/kbdconfig | 42 --------------------- meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb | 32 ---------------- meta/packages/matchbox-wm/matchbox-wm_1.1.bb | 37 ------------------ meta/packages/matchbox-wm/matchbox-wm_1.2.bb | 41 -------------------- meta/packages/matchbox-wm/matchbox-wm_svn.bb | 44 ---------------------- 7 files changed, 248 deletions(-) delete mode 100644 meta/packages/matchbox-wm/matchbox-wm/configure_fix.patch delete mode 100644 meta/packages/matchbox-wm/matchbox-wm/gconf-2.m4 delete mode 100644 meta/packages/matchbox-wm/matchbox-wm/kbdconfig delete mode 100644 meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb delete mode 100644 meta/packages/matchbox-wm/matchbox-wm_1.1.bb delete mode 100644 meta/packages/matchbox-wm/matchbox-wm_1.2.bb delete mode 100644 meta/packages/matchbox-wm/matchbox-wm_svn.bb (limited to 'meta/packages/matchbox-wm') diff --git a/meta/packages/matchbox-wm/matchbox-wm/configure_fix.patch b/meta/packages/matchbox-wm/matchbox-wm/configure_fix.patch deleted file mode 100644 index 52cea0e8f7..0000000000 --- a/meta/packages/matchbox-wm/matchbox-wm/configure_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: matchbox-window-manager/configure.ac -=================================================================== ---- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000 -+++ matchbox-window-manager/configure.ac 2007-11-14 12:18:55.000000000 +0000 -@@ -283,7 +283,7 @@ - yes) - - case "$expat" in -- yes) -+ yes|"") - EXPAT_LIBS="-lexpat" - ;; - *) diff --git a/meta/packages/matchbox-wm/matchbox-wm/gconf-2.m4 b/meta/packages/matchbox-wm/matchbox-wm/gconf-2.m4 deleted file mode 100644 index aca7c7da45..0000000000 --- a/meta/packages/matchbox-wm/matchbox-wm/gconf-2.m4 +++ /dev/null @@ -1,39 +0,0 @@ -dnl AM_GCONF_SOURCE_2 -dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -dnl (i.e. pass to gconftool-2 -dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -dnl you should install foo.schemas files -dnl - -AC_DEFUN([AM_GCONF_SOURCE_2], -[ - if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then - GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` - else - GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE - fi - - AC_ARG_WITH(gconf-source, - [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) - - AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) - AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) - - if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then - GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' - fi - - AC_ARG_WITH(gconf-schema-file-dir, - [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) - - AC_SUBST(GCONF_SCHEMA_FILE_DIR) - AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) - - AC_ARG_ENABLE(schemas-install, - [ --disable-schemas-install Disable the schemas installation], - [case ${enableval} in - yes|no) ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; - esac]) - AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) -]) diff --git a/meta/packages/matchbox-wm/matchbox-wm/kbdconfig b/meta/packages/matchbox-wm/matchbox-wm/kbdconfig deleted file mode 100644 index 239da8f57c..0000000000 --- a/meta/packages/matchbox-wm/matchbox-wm/kbdconfig +++ /dev/null @@ -1,42 +0,0 @@ -# -# This is an example keyboard config file for matchbox -# -# You can edit this file or change per user by copying to -# ~/.matchbox/kbdconfig -# -# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox ) - -### Window operation short cuts - -n=next -p=prev -c=close -d=desktop -m=!matchbox-remote -mbmenu - -### App launching. - -x=!xterm -r=!rxvt - -### poky additions - -XF86Calendar=!$contacts -telephone=!$dates -XF86Start=!matchbox-remote -desktop -F2=!matchbox-remote -mbmenu - -#XF86Mail=!$tasks -#Escape=close - -### windows style key shortcuts - -Tab=next -Tab=prev - -space=taskmenu -escape=!matchbox-remote -mbmenu -f4=close - -f11=fullscreen - diff --git a/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb deleted file mode 100644 index e09eb00ed1..0000000000 --- a/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb +++ /dev/null @@ -1,32 +0,0 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat gconf" -PR="r2" - - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \ - file://kbdconfig" - -S = "${WORKDIR}/matchbox-window-manager-${PV}" - -inherit autotools pkgconfig update-alternatives - -FILES_${PN} = "${bindir}/* \ - ${datadir}/matchbox \ - ${sysconfdir}/matchbox \ - ${datadir}/themes/blondie/matchbox \ - ${datadir}/themes/Default/matchbox \ - ${datadir}/themes/MBOpus/matchbox" - -ALTERNATIVE_NAME = "x-session-manager" -ALTERNATIVE_LINK = "${bindir}/x-session-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" -ALTERNATIVE_PRIORITY = "10" - -EXTRA_OECONF = " --enable-startup-notification --disable-xrm" - -do_install_prepend() { - install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig -} - diff --git a/meta/packages/matchbox-wm/matchbox-wm_1.1.bb b/meta/packages/matchbox-wm/matchbox-wm_1.1.bb deleted file mode 100644 index ebed31e2a5..0000000000 --- a/meta/packages/matchbox-wm/matchbox-wm_1.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat" -PR="r4" - - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/matchbox-window-manager-${PV}.tar.gz \ - file://kbdconfig \ - file://gconf-2.m4" - -S = "${WORKDIR}/matchbox-window-manager-${PV}" - -inherit autotools pkgconfig update-alternatives - -FILES_${PN} = "${bindir}/* \ - ${datadir}/matchbox \ - ${sysconfdir}/matchbox \ - ${datadir}/themes/blondie/matchbox \ - ${datadir}/themes/Default/matchbox \ - ${datadir}/themes/MBOpus/matchbox" - -ALTERNATIVE_NAME = "x-session-manager" -ALTERNATIVE_LINK = "${bindir}/x-session-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" -ALTERNATIVE_PRIORITY = "10" - -EXTRA_OECONF = " --enable-startup-notification --disable-xrm" - -do_configure_prepend () { - cp ${WORKDIR}/gconf-2.m4 ${S}/ -} - -do_install_prepend() { - install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig -} - diff --git a/meta/packages/matchbox-wm/matchbox-wm_1.2.bb b/meta/packages/matchbox-wm/matchbox-wm_1.2.bb deleted file mode 100644 index f68eb2b4ae..0000000000 --- a/meta/packages/matchbox-wm/matchbox-wm_1.2.bb +++ /dev/null @@ -1,41 +0,0 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat" -PR = "r4" - -SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ - file://configure_fix.patch;patch=1 \ - file://kbdconfig \ - file://gconf-2.m4" - -S = "${WORKDIR}/matchbox-window-manager-${PV}" - -inherit autotools pkgconfig update-alternatives - -FILES_${PN} = "${bindir}/* \ - ${datadir}/matchbox \ - ${sysconfdir}/matchbox \ - ${datadir}/themes/blondie/matchbox \ - ${datadir}/themes/Default/matchbox \ - ${datadir}/themes/MBOpus/matchbox" - -ALTERNATIVE_NAME = "x-session-manager" -ALTERNATIVE_LINK = "${bindir}/x-session-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" -ALTERNATIVE_PRIORITY = "10" - -EXTRA_OECONF = " --enable-startup-notification \ - --disable-xrm \ - --enable-expat \ - --with-expat-lib=${STAGING_LIBDIR} \ - --with-expat-includes=${STAGING_INCDIR}" - - -do_configure_prepend () { - cp ${WORKDIR}/gconf-2.m4 ${S}/ -} - -do_install_prepend() { - install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig -} diff --git a/meta/packages/matchbox-wm/matchbox-wm_svn.bb b/meta/packages/matchbox-wm/matchbox-wm_svn.bb deleted file mode 100644 index 09c0f70f47..0000000000 --- a/meta/packages/matchbox-wm/matchbox-wm_svn.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "Matchbox window manager" -HOMEPAGE = "http://matchbox-project.org" -BUGTRACKER = "http://bugzilla.openedhand.com/" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://src/wm.h;endline=21;md5=a7e844465edbcf79c282369f93caa835 \ - file://src/main.c;endline=21;md5=3e5d9f832b527b0d72dbe8e3c4c60b95 \ - file://src/wm.c;endline=21;md5=8dc9d24477d87ef5dfbc2e4927146aab" - -SECTION = "x11/wm" -DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf" - -PV = "1.2+svnr${SRCREV}" -PR = "r4" - -SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \ - file://configure_fix.patch;patch=1;maxrev=1818 \ - file://kbdconfig" - -S = "${WORKDIR}/matchbox-window-manager" - -inherit autotools pkgconfig update-alternatives - -ALTERNATIVE_NAME = "x-session-manager" -ALTERNATIVE_LINK = "${bindir}/x-session-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" -ALTERNATIVE_PRIORITY = "10" - -FILES_${PN} = "${bindir}/* \ - ${datadir}/matchbox \ - ${sysconfdir}/matchbox \ - ${datadir}/themes/blondie/matchbox \ - ${datadir}/themes/Default/matchbox \ - ${datadir}/themes/MBOpus/matchbox" - -EXTRA_OECONF = " --enable-startup-notification \ - --disable-xrm \ - --enable-expat \ - --with-expat-lib=${STAGING_LIBDIR} \ - --with-expat-includes=${STAGING_INCDIR}" - -do_install_prepend() { - install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig -} -- cgit v1.2.3