perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Merge pull request #2440 from Stefan-Code/master"

Browse Source 
This reverts commit 81bc6bf34b, reversing
changes made to 7de736e8d0.

Unfortunately this tricks the upgrade system into picking the wrong
binary. We need to fix the upgrade system before merging this.
This commit is contained in:
Jakob Borg
2015-11-09 14:23:07 +01:00
parent 74a2e80142
commit 19bf51cefb
4 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.go
View File

@@ -315,7 +315,6 @@ func buildDeb() {
{src: "man/syncthing-versioning.7", dst: "deb/usr/share/man/man7/syncthing-versioning.7", perm: 0644},
{src: "etc/linux-systemd/system/syncthing@.service", dst: "deb/lib/systemd/system/syncthing@.service", perm: 0644},
{src: "etc/linux-systemd/user/syncthing.service", dst: "deb/usr/lib/systemd/user/syncthing.service", perm: 0644},
{src: "etc/firewall-ufw/syncthing", dst: "deb/etc/ufw/applications.d/syncthing", perm: 0644},
}
for _, file := range listFiles("extra") {
@@ -344,8 +343,6 @@ Description: Open Source Continuous File Synchronization
-- Jakob Borg <jakob@nym.se> {{date}}
`
conffiles := "/etc/ufw/applications.d/syncthing\n"
control = strings.Replace(control, "{{arch}}", debarch, -1)
control = strings.Replace(control, "{{version}}", version[1:], -1)
changelog = strings.Replace(changelog, "{{arch}}", debarch, -1)
@@ -356,7 +353,6 @@ Description: Open Source Continuous File Synchronization
ioutil.WriteFile("deb/DEBIAN/control", []byte(control), 0644)
ioutil.WriteFile("deb/DEBIAN/compat", []byte("9\n"), 0644)
ioutil.WriteFile("deb/DEBIAN/changelog", []byte(changelog), 0644)
ioutil.WriteFile("deb/DEBIAN/conffiles", []byte(conffiles), 0644)
}