From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 7 Oct 2012 12:06:21 +0000 (+0000)
Subject: luci-0.11: merge r9353 and r9354
X-Git-Tag: 0.11.0~14
X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=fef33765a35cdabd4c27038628d9c4705e9ef8f6;hp=876f6c703d5be111973dc7f3e20e75f6ce502218

luci-0.11: merge r9353 and r9354
---

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 9c0ca745e6..2b8bbfe32c 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -1,6 +1,6 @@
 include $(TOPDIR)/rules.mk
 
-PKG_BRANCH:=trunk
+PKG_BRANCH:=branches/luci-0.11
 
 ifeq ($(DUMP),)
   USELOCAL:=$(shell grep luci ../../../.project 2>/dev/null >/dev/null && echo 1)
@@ -12,12 +12,12 @@ PKG_RELEASE:=1
 PKG_BUILD_PARALLEL:=0
 
 ifeq ($(USELOCAL),1)
-  PKG_VERSION:=trunk+svn
+  PKG_VERSION:=0.11+svn
 else
   PKG_SOURCE_URL:=http://svn.luci.subsignal.org/luci/$(PKG_BRANCH)
   ifeq ($(DUMP),)
     PKG_REV:=$(shell LC_ALL=C svn info $(CURDIR) | sed -ne's/^Revision: //p')
-    PKG_VERSION:=trunk+svn$(PKG_REV)
+    PKG_VERSION:=0.11+svn$(PKG_REV)
   endif
   PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
   PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz