From: Ian Leonard <redacted>
Date: Sun, 10 Aug 2014 08:09:06 +0000 (-0700)
Subject: Merge branch 'master' into license-updates
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=f5a1d1bba66d293486dc74bbc1de767dc7054013;p=openwrt-packages.git

Merge branch 'master' into license-updates

Signed-off-by: Ian Leonard <redacted>

Conflicts:
	devel/patch/Makefile
	multimedia/minidlna/Makefile
---

f5a1d1bba66d293486dc74bbc1de767dc7054013
diff --cc devel/patch/Makefile
index 2532ef2cd,0177d707a..63809c5b8
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@@ -11,11 -11,9 +11,11 @@@ PKG_NAME:=patc
  PKG_VERSION:=2.7.1
  PKG_RELEASE:=1
  
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
  PKG_SOURCE_URL:=@GNU/patch
- PKG_MD5SUM:=95dd8d7e41dcbcecdd5cd88ef915378d
+ PKG_MD5SUM:=e9ae5393426d3ad783a300a338c09b72
 +PKG_LICENSE:=GPL-3.0+
 +PKG_LICENSE_FILES:=COPYING
  
  include $(INCLUDE_DIR)/package.mk
  
diff --cc multimedia/minidlna/Makefile
index 2306788d0,a4ab71d54..2b30ba839
--- a/multimedia/minidlna/Makefile
+++ b/multimedia/minidlna/Makefile
@@@ -14,9 -14,11 +14,11 @@@ PKG_RELEASE:=
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=@SF/minidlna
  PKG_MD5SUM:=879027192c89e5376cdd2ae2d1aa33b4
 +PKG_LICENSE:=GPL-2.0 BSD-3-Clause
 +PKG_LICENSE_FILES:=COPYING LICENCE.miniupnpd
+ 
  PKG_MAINTAINER:=Knyazkov Dmitry <medavedik@gmail.com>
+ 
 -PKG_LICENSE:=GPL-2.0
 -PKG_LICENSE_FILE:=COPYING
  PKG_BUILD_PARALLEL:=0
  PKG_BUILD_DEPENDS:=util-linux
  
diff --cc net/rsync/Makefile
index e73aebca3,0231047a8..6d6d201b6
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@@ -14,9 -14,8 +14,10 @@@ PKG_RELEASE:=
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
  PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/src
  PKG_MD5SUM:=43bd6676f0b404326eee2d63be3cdcfe
 +PKG_LICENSE:=GPL-3.0
 +PKG_LICENSE_FILES:=COPYING
  PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
+ PKG_LICENSE:=GPL-3.0
  
  PKG_INSTALL:=1
  PKG_BUILD_PARALLEL:=1