Bump version to v1.5.0; add package feed

diff --git a/docs/FAQ.md b/docs/FAQ.md
index d86052585b42e837bb1791af6d3a5bf0da91ab79..7eb94836f97350c48228e86586ffdd5867311e7c 100644 (file)
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -22,7 +22,7 @@ make improvements that benefit the community as a whole.
 
 ## What devices does libreCMC work with?
 
 
 ## What devices does libreCMC work with?
 

-The libreCMC project supports mostly consumer-grade router and a few other
+The libreCMC project supports mostly consumer-grade routers and a few other

 embedded devices.  This list can be found on the Supported Hardware page. While
 this list is not extensive, the libreCMC project has very strict requirements
 for supporting devices. Some examples include:
 embedded devices.  This list can be found on the Supported Hardware page. While
 this list is not extensive, the libreCMC project has very strict requirements
 for supporting devices. Some examples include:


@@ -33,7 +33,7 @@ software. The project will still consider some level of support if it does not
 meet this requirement and meets all of the other requirements.
 
 * The hardware can't require non-free software or binary blobs to work. Non-free
 meet this requirement and meets all of the other requirements.
 
 * The hardware can't require non-free software or binary blobs to work. Non-free

-Software / Blobs are pieces of software where we (the community) does not have
+Software / Blobs are pieces of software where we (the community) do not have

 the source code under a proper Free Software [1] license. Non-free Software and
 blobs make supporting a device for any length of time a chore and usually
 support evaporates when device vendors stop releasing new blobs / components.
 the source code under a proper Free Software [1] license. Non-free Software and
 blobs make supporting a device for any length of time a chore and usually
 support evaporates when device vendors stop releasing new blobs / components.

diff --git a/feeds.conf.default b/feeds.conf.default
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7fb0124ed9b05199059b520907847a217371496c 100644 (file)
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -0,0 +1 @@
+src-git packages https://gogs.librecmc.org/librecmc/package-feed.git;v1.5

diff --git a/include/version.mk b/include/version.mk
index 23f9db6a0cdf684b55c19e119927813afcdd815b..f5b43a866c017a7af8be3d7aa43278475eb2524c 100644 (file)
--- a/include/version.mk
+++ b/include/version.mk
@@ -26,7 +26,7 @@ PKG_CONFIG_DEPENDS += \
 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
 
 VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
 
 VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))

-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),v1.5.0-rc3)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),v1.5.0)

 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
 VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
 VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))