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/liblzo | |
| 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/liblzo')
| -rw-r--r-- | package/liblzo/Makefile | 12 | ||||
| -rw-r--r-- | package/liblzo/ipkg/liblzo.control | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile index e78dd5ff6..6259a59fd 100644 --- a/package/liblzo/Makefile +++ b/package/liblzo/Makefile @@ -6,15 +6,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= lzo -PKG_VERSION:= 2.02 +PKG_VERSION:= 2.03 PKG_RELEASE:= 1 -PKG_MD5SUM:= 6760e5819f4238328709bf93bf10071c - -MASTER_SITES:= http://www.oberhumer.com/opensource/lzo/download/ +PKG_MD5SUM:= 0c3d078c2e8ea5a88971089a2f02a726 +PKG_DESCR:= a real-time data compression library +PKG_SECTION:= libs +PKG_URL:= http://www.oberhumer.com/opensource/lzo +PKG_SITES:= http://www.oberhumer.com/opensource/lzo/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-static diff --git a/package/liblzo/ipkg/liblzo.control b/package/liblzo/ipkg/liblzo.control deleted file mode 100644 index 3f84ee6f2..000000000 --- a/package/liblzo/ipkg/liblzo.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: liblzo -Priority: optional -Section: libs -Description: a real-time data compression library |