diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/fbset | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/fbset')
| -rw-r--r-- | package/fbset/Makefile | 7 | ||||
| -rw-r--r-- | package/fbset/ipkg/fbset.control | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/package/fbset/Makefile b/package/fbset/Makefile index 0fd9bf9cf..23819e5f8 100644 --- a/package/fbset/Makefile +++ b/package/fbset/Makefile @@ -9,12 +9,13 @@ PKG_NAME:= fbset PKG_VERSION:= 2.1 PKG_RELEASE:= 1 PKG_MD5SUM:= e547cfcbb8c1a4f2a6b8ba4acb8b7164 - -MASTER_SITES:= http://users.telenet.be/geertu/Linux/fbdev/ +PKG_DESCR:= framebuffer utility +PKG_SECTION:= utils +PKG_SITES:= http://users.telenet.be/geertu/Linux/fbdev/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FBSET,fbset,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FBSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/fbset/ipkg/fbset.control b/package/fbset/ipkg/fbset.control deleted file mode 100644 index b449b1de7..000000000 --- a/package/fbset/ipkg/fbset.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: fbset -Priority: optional -Section: net -Description: framebuffer utility |