Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/richdocuments.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2016-04-17 12:56:56 +0300
committerAndras Timar <andras.timar@collabora.com>2016-04-17 12:56:56 +0300
commit8e2ee31a13029b35a0c3d68c48c273be6b158cdb (patch)
treeff66ed0e870e29f6cb9ca157a10413c2b216c500
parent76a7e3f7a13fc45d740f431fa5f8293c16bb8f9b (diff)
Bump version to 0.15.0
-rw-r--r--.gitignore1
-rw-r--r--Makefile8
-rw-r--r--appinfo/info.xml.in (renamed from appinfo/info.xml)2
3 files changed, 7 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index f1e69208..31b647d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ webodf/*
build/*
online
loolvm
+appinfo/info.xml
diff --git a/Makefile b/Makefile
index c7d9e513..0139155b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-VERSION=0.14.0
+VERSION=0.15.0
.PHONY: dist
-dist: owncloud-collabora-online.spec
+dist: owncloud-collabora-online.spec info.xml
rm -rf owncloud-collabora-online-$(VERSION)
mkdir owncloud-collabora-online-$(VERSION)
- tar cf - *.php \
+ tar cf - --exclude appinfo/info.xml.in *.php \
appinfo \
assets \
controller \
@@ -24,3 +24,5 @@ dist: owncloud-collabora-online.spec
owncloud-collabora-online.spec: owncloud-collabora-online.spec.in Makefile
sed -e 's/@PACKAGE_VERSION@/$(VERSION)/g' <owncloud-collabora-online.spec.in >owncloud-collabora-online.spec
+info.xml: appinfo/info.xml.in Makefile
+ sed -e 's/@PACKAGE_VERSION@/$(VERSION)/g' <appinfo/info.xml.in >appinfo/info.xml
diff --git a/appinfo/info.xml b/appinfo/info.xml.in
index 2fee7e0f..3d15605b 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml.in
@@ -4,7 +4,7 @@
<name>Collabora Online</name>
<description>An ownCloud app to work with office documents</description>
<licence>AGPL</licence>
- <version>0.14.0</version>
+ <version>@PACKAGE_VERSION@</version>
<author>Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk</author>
<bugs>https://github.com/owncloud/richdocuments/issues</bugs>
<repository type="git">https://github.com/owncloud/richdocuments.git</repository>