- And delete service.conf.shipped on uninstall.

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

diff --git a/doc/Changelog b/doc/Changelog
index 5a05ac372fc47e30bdbb8ebcb5428f4b01f33344..5d3e911f335756286096fe513c8420353b01036b 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+10 June 2016: Wouter
+       - And delete service.conf.shipped on uninstall.
+
 9 June 2016: Wouter
        - Trunk is called 1.5.10 (with previous fixes already in there to 2
          june).

diff --git a/winrc/setup.nsi b/winrc/setup.nsi
index 99f2b179467a8670b30bb49013ed1741e84b73e1..15735933accded9e574616bc0457d055ac6497dd 100644 (file)
--- a/winrc/setup.nsi
+++ b/winrc/setup.nsi
@@ -189,6 +189,7 @@ section "un.Unbound"
        Delete "$INSTDIR\unbound-control-setup.cmd"
        Delete "$INSTDIR\unbound-website.url"
        Delete "$INSTDIR\service.conf"
+       Delete "$INSTDIR\service.conf.shipped"
        Delete "$INSTDIR\example.conf"
        Delete "$INSTDIR\Changelog"
        Delete "$INSTDIR\root.key"