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/jpeg | |
| 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/jpeg')
| -rw-r--r-- | package/jpeg/Makefile | 8 | ||||
| -rw-r--r-- | package/jpeg/ipkg/libjpeg.control | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile index a5a94ea8a..5c4e8f05c 100644 --- a/package/jpeg/Makefile +++ b/package/jpeg/Makefile @@ -9,13 +9,17 @@ PKG_NAME:= jpeg PKG_VERSION:= 6b PKG_RELEASE:= 1 PKG_MD5SUM:= dbd5f3b47ed13132f04c685d608a7547 -MASTER_SITES:= http://www.ijg.org/files/ \ +PKG_DESCR:= The Independent JPEG Groups JPEG runtime library +PKG_SECTION:= libs +PKG_URL:= http://sourceforge.net/projects/libjpeg +PKG_SITES:= http://www.ijg.org/files/ \ ftp://ftp.uu.net/graphics/jpeg/ + DISTFILES:= ${PKG_NAME}src.v${PKG_VERSION}.tar.gz include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/jpeg/ipkg/libjpeg.control b/package/jpeg/ipkg/libjpeg.control deleted file mode 100644 index 83111d7c7..000000000 --- a/package/jpeg/ipkg/libjpeg.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: libjpeg -Priority: optional -Section: libs -Depends: -Description: The Independent JPEG Group's JPEG runtime library - |