diff options
author | Marcin Juszkiewicz <hrw@openembedded.org> | 2005-08-22 10:33:14 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-22 10:33:14 +0000 |
commit | f4b89660bcbeba3e9ed542e0a84273f7f7fb433f (patch) | |
tree | f508899945d3370c4985bcf68c69ccfda2a02337 | |
parent | 1d1e09a9271b91a3985dcf056a55d4e96782384d (diff) | |
parent | 3807068da154ade5c2e52b13faf15c9488fb3f24 (diff) |
merge of 22ca4fd70d5673f7122ddd1ac0a7874b737c1dc6
and 3fdee15138882a8e7bbd364727e5c68a993ed862
-rw-r--r-- | packages/e17/e-wm_20050810.bb | 2 | ||||
-rw-r--r-- | packages/gammu/gammu_1.02.0.bb (renamed from packages/gammu/gammu_1.01.0.bb) | 0 | ||||
-rw-r--r-- | packages/kdepimpi/kdepimpi_2.2.2.bb (renamed from packages/kdepimpi/kdepimpi_2.1.18.bb) | 0 | ||||
-rw-r--r-- | packages/kdepimpi/pwmpi_2.2.2.bb (renamed from packages/kdepimpi/pwmpi_2.1.18.bb) | 0 | ||||
-rw-r--r-- | packages/nonworking/meta/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/nonworking/meta/e-image.bb (renamed from packages/meta/e-image.bb) | 0 | ||||
-rw-r--r-- | packages/ssmtp/ssmtp_2.61.bb | 1 | ||||
-rw-r--r-- | packages/ttf-fonts/ttf-dejavu_1.13-20050820.bb (renamed from packages/ttf-fonts/ttf-dejavu_1.11.bb) | 6 |
8 files changed, 6 insertions, 3 deletions
diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050810.bb index ea93bfc3e2..e0fa41311c 100644 --- a/packages/e17/e-wm_20050810.bb +++ b/packages/e17/e-wm_20050810.bb @@ -30,4 +30,4 @@ FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" do_install_append() { install -d ${D}/${sysconfdir}/X11/Xsession.d install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d -}
\ No newline at end of file +} diff --git a/packages/gammu/gammu_1.01.0.bb b/packages/gammu/gammu_1.02.0.bb index 967a551eb2..967a551eb2 100644 --- a/packages/gammu/gammu_1.01.0.bb +++ b/packages/gammu/gammu_1.02.0.bb diff --git a/packages/kdepimpi/kdepimpi_2.1.18.bb b/packages/kdepimpi/kdepimpi_2.2.2.bb index f3dde1a2fd..f3dde1a2fd 100644 --- a/packages/kdepimpi/kdepimpi_2.1.18.bb +++ b/packages/kdepimpi/kdepimpi_2.2.2.bb diff --git a/packages/kdepimpi/pwmpi_2.1.18.bb b/packages/kdepimpi/pwmpi_2.2.2.bb index 904f640955..904f640955 100644 --- a/packages/kdepimpi/pwmpi_2.1.18.bb +++ b/packages/kdepimpi/pwmpi_2.2.2.bb diff --git a/packages/nonworking/meta/.mtn2git_empty b/packages/nonworking/meta/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/nonworking/meta/.mtn2git_empty diff --git a/packages/meta/e-image.bb b/packages/nonworking/meta/e-image.bb index d58215d3a7..d58215d3a7 100644 --- a/packages/meta/e-image.bb +++ b/packages/nonworking/meta/e-image.bb diff --git a/packages/ssmtp/ssmtp_2.61.bb b/packages/ssmtp/ssmtp_2.61.bb index 425f7a607b..72cf7e63e4 100644 --- a/packages/ssmtp/ssmtp_2.61.bb +++ b/packages/ssmtp/ssmtp_2.61.bb @@ -3,6 +3,7 @@ MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" DEPENDS = "openssl" DESCRIPTION = "Extremely simple MTA to get mail off the system to a mail hub." LICENCE = "GPL" +LICENCE = "GPL" PR = "r5" SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \ diff --git a/packages/ttf-fonts/ttf-dejavu_1.11.bb b/packages/ttf-fonts/ttf-dejavu_1.13-20050820.bb index 64d0ac3e60..394b79005c 100644 --- a/packages/ttf-fonts/ttf-dejavu_1.11.bb +++ b/packages/ttf-fonts/ttf-dejavu_1.13-20050820.bb @@ -2,11 +2,13 @@ DESCRIPTION = "DejaVu font - TTF Edition" LICENSE = "Bitstream Vera" HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page" -SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.gz" +#SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.gz" +SRC_URI = "http://dejavu.sourceforge.net/snapshots/dejavu-ttf-20050820.tar.gz" include ttf.inc -S = "${WORKDIR}/dejavu-ttf-${PV}" +#S = "${WORKDIR}/dejavu-ttf-${PV}" +S = "${WORKDIR}/dejavu-ttf-20050820" PACKAGES = "ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \ ttf-dejavu-serif ttf-dejavu-serif-condensed" |