release xxv-1.7.0

3 files changed, 53 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 6fb156b..ad95bb8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,9 @@
 #
 # Makefile
 #
-# $Id$
 
 XXV = xxv
-VERSION = 1.6.1
+VERSION = 1.7.0
 
 ### The name of the distribution archive:
 
@@ -29,7 +28,8 @@ tmpfolder:
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 
 copyfiles:
-	@svn export . $(TMPDIR)/$(ARCHIVE)
+	@mkdir -p $(TMPDIR)/$(ARCHIVE)
+	@git checkout-index -a -f --prefix=$(TMPDIR)/$(ARCHIVE)/
 
 
 removefiles:
@@ -70,7 +70,7 @@ dist: tmpfolder\
     updateversion\
     setpermission
 	@chown root.root -R $(TMPDIR)/$(ARCHIVE)/*
-	@tar czf $(PACKAGE).tgz --exclude=.svn -C $(TMPDIR) $(ARCHIVE)
+	@tar czf $(PACKAGE).tgz --exclude=.git -C $(TMPDIR) $(ARCHIVE)
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@echo Distribution package created as $(PACKAGE).tgz
 
diff --git a/README b/README
index 27d25b1..a6d0cfd 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 XXV means "Xtreme eXtension for VDR" and is a central service for the 
 administration of the VDR and his environment.
 
-Written by:                  Andreas Brachold <vdr07 at deltab.de> 2005-2012
+Written by:                  Andreas Brachold <vdr07 at deltab.de> 2005-2015
                              Frank Herrmann <xpix at xpix dot de> 2004-2007
 
 Project's homepage:          http://projects.vdr-developer.org/projects/xxv
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index bc3db1e..26fd65d 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,51 @@
+1.7.0 - Stable release (bugfixed)
+
+Move project homepage
+Update package depends
+Update translations
+
+Skins: 
+* blue, snow, stone  Expansion of the table width (#933, #1358)
+* correct border padding for Internet Explorer (#941)
+* skin flat - add missing vtx template
+* remove dead links to tvm
+* remove fallback to "default skin" handling
+* jason
+    if the recording is greater than 24 hours a wrong time is displayed (#938)
+    hide toggle button on event without timer
+    allow toggle from any view
+    epg-view 'now' toggle timer failed
+    support content description
+
+Moduls
+* Support VDR > 1.7.21
+* Use default FOREACH syntax #1355
+* Option 'SQL_CACHE' used twice in statement (#1356)
+* don't dump internal preferences into perl self documentation (pod)
+* Disable INTERFACE, TELNET, WAPD by default
+* AUTOTIMER: 
+    limit extract of abstract title
+* RECORDS:
+    wrong path of ts-recording created, if lifetime was edited (#844)
+    Add checks if framerate missed, #18381
+* EPG
+    handle SI:content description
+    only first Channel is shown in the EPG Timeframe (#838)
+    all events marked as running (#838)
+    improve sql-query on single host environment
+* TIMERS: 
+    improve query performence
+* SVDRP: 
+    independent hold of version for any VDR
+    read svdrp default port from /etc/services (tcp:6419)
+* RECORDS:
+    Improve handling if vdr offline
+    Warn if info file missed (fix database insert)
+    Generate some more preview images
+* HTTP:
+    Report epg search to browser via opensearch
+
+
 1.6.1 - Stable release (bugfixed)
 --------------------------------------------------------------------------------