From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 2 Dec 2015 17:55:03 +0000 (+0000)
Subject: - For 724: Add Changelog to windows binary dist.
X-Git-Tag: release-1.5.7rc1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1037cece1ed5d30dc3a7047973b9e6276a9e21a;p=thirdparty%2Funbound.git

- For 724: Add Changelog to windows binary dist.


git-svn-id: file:///svn/unbound/trunk@3566 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/doc/Changelog b/doc/Changelog
index e3262993d..e0b02cd75 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 2 December 2015: Wouter
 	- Fixup 724: Fix PCA prompt for unbound-service-install.exe.
 	  re-enable stdout printout.
+	- For 724: Add Changelog to windows binary dist.
 
 1 December 2015: Ralph
 	- Qname minimisation review fixes
diff --git a/makedist.sh b/makedist.sh
index 77f59b092..5f19dfb68 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -328,10 +328,10 @@ if [ "$DOWIN" = "yes" ]; then
     $strip unbound-service-install.exe
     $strip unbound-service-remove.exe
     cd tmp.$$
-    cp ../doc/example.conf example.conf
+    cp ../doc/example.conf ../doc/Changelog .
     cp ../unbound.exe ../unbound-anchor.exe ../unbound-host.exe ../unbound-control.exe ../unbound-checkconf.exe ../unbound-service-install.exe ../unbound-service-remove.exe ../LICENSE ../winrc/unbound-control-setup.cmd ../winrc/unbound-website.url ../winrc/service.conf ../winrc/README.txt ../contrib/create_unbound_ad_servers.cmd ../contrib/warmup.cmd ../contrib/unbound_cache.cmd .
     # zipfile
-    zip ../$file LICENSE README.txt unbound.exe unbound-anchor.exe unbound-host.exe unbound-control.exe unbound-checkconf.exe unbound-service-install.exe unbound-service-remove.exe unbound-control-setup.cmd example.conf service.conf unbound-website.url create_unbound_ad_servers.cmd warmup.cmd unbound_cache.cmd
+    zip ../$file LICENSE README.txt unbound.exe unbound-anchor.exe unbound-host.exe unbound-control.exe unbound-checkconf.exe unbound-service-install.exe unbound-service-remove.exe unbound-control-setup.cmd example.conf service.conf unbound-website.url create_unbound_ad_servers.cmd warmup.cmd unbound_cache.cmd Changelog
     info "Testing $file"
     (cd .. ; zip -T $file )
     # installer
diff --git a/winrc/setup.nsi b/winrc/setup.nsi
index b291b9f6b..513b30015 100644
--- a/winrc/setup.nsi
+++ b/winrc/setup.nsi
@@ -94,6 +94,7 @@ section "-hidden.postinstall"
 	File "unbound-website.url"
 	File "service.conf"
 	File "..\doc\example.conf"
+	File "..\doc\Changelog"
 
 	# Store Root Key choice
 	SectionGetFlags ${SectionRootKey} $R0
@@ -180,6 +181,7 @@ section "un.Unbound"
 	Delete "$INSTDIR\unbound-website.url"
 	Delete "$INSTDIR\service.conf"
 	Delete "$INSTDIR\example.conf"
+	Delete "$INSTDIR\Changelog"
 	Delete "$INSTDIR\root.key"
 	RMDir "$INSTDIR"