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/nano | |
| 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/nano')
| -rw-r--r-- | package/nano/Makefile | 12 | ||||
| -rw-r--r-- | package/nano/files/nano.conffiles (renamed from package/nano/ipkg/nano.conffiles) | 0 | ||||
| -rw-r--r-- | package/nano/ipkg/nano.control | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/package/nano/Makefile b/package/nano/Makefile index 1da397446..65baf4f69 100644 --- a/package/nano/Makefile +++ b/package/nano/Makefile @@ -6,14 +6,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nano -PKG_VERSION:= 2.0.6 +PKG_VERSION:= 2.0.9 PKG_RELEASE:= 1 -PKG_MD5SUM:= 619107f0fc3c4383d668cef15aa3ca32 -MASTER_SITES:= http://www.nano-editor.org/dist/v2.0/ +PKG_MD5SUM:= 2be94dc43fb60fff4626a2401a977220 +PKG_DESCR:= An enhanced clone of the Pico text editor +PKG_SECTION:= admin +PKG_DEPENDS:= libncurses +PKG_URL:= http://www.nano-editor.org +PKG_SITES:= http://www.nano-editor.org/dist/v2.0/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NANO,nano,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,NANO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_header_regex_h=no diff --git a/package/nano/ipkg/nano.conffiles b/package/nano/files/nano.conffiles index ecc14ac9c..ecc14ac9c 100644 --- a/package/nano/ipkg/nano.conffiles +++ b/package/nano/files/nano.conffiles diff --git a/package/nano/ipkg/nano.control b/package/nano/ipkg/nano.control deleted file mode 100644 index e68daef6b..000000000 --- a/package/nano/ipkg/nano.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: nano -Priority: optional -Section: admin -Depends: libncurses -Description: An enhanced clone of the Pico text editor |