diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@yahoo.com> | 2006-09-08 21:04:32 +0000 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@yahoo.com> | 2006-09-08 21:04:32 +0000 |
| commit | 2b05569816a1761c7af0858e94733439782bca24 (patch) | |
| tree | 6add6aabb3e997f8e5504cedd251465f45e7d8f0 | |
| parent | 8f9019eb06a381e31968b8ce7a0dcb68c3e7f7d0 (diff) | |
| parent | 80dc026cbf171b5eb9eab9c828861202e5106e2c (diff) | |
merge of '277f2a83646d0f7a24e0b10b4d24642817d8c5ed'
and '8e2f55d069989cbd21cd91eaff2dc3fdaa40a40c'
| -rw-r--r-- | packages/meta/slugos-packages.bb | 6 | ||||
| -rw-r--r-- | packages/ushare/ushare_0.9.7.bb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 3b1ffb306c..fe9cb506d5 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r12" +PR = "r14" CONFLICTS = "db3" PROVIDES += "${SLUGOS_IMAGENAME}-packages" @@ -74,7 +74,7 @@ SLUGOS_PACKAGES = "\ gtk-doc \ gzip \ hdparm \ - icecast \ +# icecast \ ifupdown \ ipkg-utils \ iptables \ @@ -164,7 +164,6 @@ SLUGOS_PACKAGES = "\ tiff \ unzip \ usbutils \ - ushare \ util-linux \ vim \ vlan \ @@ -186,6 +185,7 @@ SLUGOS_BROKEN_PACKAGES = "\ qc-usb-messenger \ unionfs-modules \ unionfs-utils \ + ushare \ " # These packages will never build because uclibc lacks (and always will lack) diff --git a/packages/ushare/ushare_0.9.7.bb b/packages/ushare/ushare_0.9.7.bb index a922fed2d0..539126c7a1 100644 --- a/packages/ushare/ushare_0.9.7.bb +++ b/packages/ushare/ushare_0.9.7.bb @@ -2,9 +2,9 @@ DESCRIPTION = "ushare is a UPnP media server" LICENSE = "GPL" HOMEPAGE = "http://ushare.geexbox.org/" MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>" -DEPENDS = "libupnp" +DEPENDS = "libupnp virtual/libiconv virtual/libintl" SRC_URI = "http://ushare.geexbox.org/releases/ushare-0.9.7.tar.bz2" S = "${WORKDIR}/ushare-${PV}" -PR = "r0" +PR = "r1" inherit autotools |