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/bc | |
| 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/bc')
| -rw-r--r-- | package/bc/Makefile | 9 | ||||
| -rw-r--r-- | package/bc/ipkg/bc.control | 4 | ||||
| -rw-r--r-- | package/bc/ipkg/dc.control | 4 |
3 files changed, 6 insertions, 11 deletions
diff --git a/package/bc/Makefile b/package/bc/Makefile index 63f91c284..f70adad9f 100644 --- a/package/bc/Makefile +++ b/package/bc/Makefile @@ -9,12 +9,15 @@ PKG_NAME:= bc PKG_VERSION:= 1.06 PKG_RELEASE:= 1 PKG_MD5SUM:= d44b5dddebd8a7a7309aea6c36fda117 -MASTER_SITES:= http://ftp.gnu.org/pub/gnu/bc/ +PKG_DESCR:= An arbitrary precision calculator language +PKG_SECTION:= util +PKG_URL:= http://www.gnu.org/software/bc +PKG_SITES:= http://ftp.gnu.org/pub/gnu/bc/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,DC,dc,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,DC,dc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/bc/ipkg/bc.control b/package/bc/ipkg/bc.control deleted file mode 100644 index e22ed5b7c..000000000 --- a/package/bc/ipkg/bc.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: bc -Priority: optional -Section: util -Description: An arbitrary precision calculator language diff --git a/package/bc/ipkg/dc.control b/package/bc/ipkg/dc.control deleted file mode 100644 index 1ef852500..000000000 --- a/package/bc/ipkg/dc.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: dc -Priority: optional -Section: util -Description: An arbitrary precision calculator |