octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-02 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Squashed commit of pull request #1875

Browse Source 
commit d60fbce311414f3ade16c7b1f6525b1d02f01699
Author: Jacek Szafarkiewicz <szafar@linux.pl>
Date:   Mon Jun 1 11:16:36 2015 +0200

    Correct order of deb files

commit 3b2ecfcc45343701ccb98483a62f70c102a70785
Merge: f4daebb c23a601
Author: Jacek Szafarkiewicz <szafar@linux.pl>
Date:   Mon Jun 1 11:15:06 2015 +0200

    Merge github.com:syncthing/syncthing

    Conflicts:
    	build.go

commit f4daebb8510f0b40b15e404817a7799e0c3b592c
Author: Jacek Szafarkiewicz <szafar@linux.pl>
Date:   Tue May 26 12:58:25 2015 +0200

    Add me to AUTHORS

commit 9e77f4bea01cc826132a5fbc6ca412cce5327e97
Author: Jacek Szafarkiewicz <szafar@linux.pl>
Date:   Tue May 26 12:57:40 2015 +0200

    Add systemd files to deb packate
This commit is contained in:
Jakob Borg 2015-07-20 14:18:07 +02:00
parent 59e829e595
commit a11aa295de
6 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -31,6 +31,7 @@ Felix Unterpaintner <bigbear2nd@gmail.com>
Francois-Xavier Gsell <fxgsell@gmail.com> Francois-Xavier Gsell <fxgsell@gmail.com>
Frank Isemann <frank@isemann.name> Frank Isemann <frank@isemann.name>
Gilli Sigurdsson <gilli@vx.is> Gilli Sigurdsson <gilli@vx.is>
Jacek Szafarkiewicz <szafar@linux.pl>
Jakob Borg <jakob@nym.se> Jakob Borg <jakob@nym.se>
James Patterson <jamespatterson@operamail.com> <jpjp@users.noreply.github.com> James Patterson <jamespatterson@operamail.com> <jpjp@users.noreply.github.com>
Jaroslav Malec <dzardacz@gmail.com> Jaroslav Malec <dzardacz@gmail.com>

1
NICKS
View File

@ -29,6 +29,7 @@ filoozoom <philippe@schommers.be>
frioux <frew@afoolishmanifesto.com> <frioux@gmail.com> frioux <frew@afoolishmanifesto.com> <frioux@gmail.com>
fti7 <frank@isemann.name> fti7 <frank@isemann.name>
gillisig <gilli@vx.is> gillisig <gilli@vx.is>
hadogenes <szafar@linux.pl>
jarlebring <jarlebring@gmail.com> jarlebring <jarlebring@gmail.com>
jedie <github.com@jensdiemer.de> <git@jensdiemer.de> jedie <github.com@jensdiemer.de> <git@jensdiemer.de>
jpjp <jamespatterson@operamail.com> <jpjp@users.noreply.github.com> jpjp <jamespatterson@operamail.com> <jpjp@users.noreply.github.com>

2
build.go
View File

@ -314,6 +314,8 @@ func buildDeb() {
{src: "man/syncthing-rest-api.7", dst: "deb/usr/share/man/man7/syncthing-rest-api.7", perm: 0644}, {src: "man/syncthing-rest-api.7", dst: "deb/usr/share/man/man7/syncthing-rest-api.7", perm: 0644},
{src: "man/syncthing-security.7", dst: "deb/usr/share/man/man7/syncthing-security.7", perm: 0644}, {src: "man/syncthing-security.7", dst: "deb/usr/share/man/man7/syncthing-security.7", perm: 0644},
{src: "man/syncthing-versioning.7", dst: "deb/usr/share/man/man7/syncthing-versioning.7", perm: 0644}, {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},
} }
for _, file := range listFiles("extra") { for _, file := range listFiles("extra") {

4
build.sh
View File

@ -54,6 +54,10 @@ case "${1:-default}" in
go run changelog.go go run changelog.go
;; ;;
deb)
go run build.go "$1"
;;
noupgrade) noupgrade)
go run build.go -no-upgrade tar go run build.go -no-upgrade tar
;; ;;

1
gui/index.html
View File

@ -1109,6 +1109,7 @@
<li class="auto-generated">Francois-Xavier Gsell</li> <li class="auto-generated">Francois-Xavier Gsell</li>
<li class="auto-generated">Frank Isemann</li> <li class="auto-generated">Frank Isemann</li>
<li class="auto-generated">Gilli Sigurdsson</li> <li class="auto-generated">Gilli Sigurdsson</li>
<li class="auto-generated">Jacek Szafarkiewicz</li>
<li class="auto-generated">Jakob Borg</li> <li class="auto-generated">Jakob Borg</li>
<li class="auto-generated">James Patterson</li> <li class="auto-generated">James Patterson</li>
<li class="auto-generated">Jaroslav Malec</li> <li class="auto-generated">Jaroslav Malec</li>

4
internal/auto/gui.files.go
View File

File diff suppressed because one or more lines are too long