diff options
| author | Jakob Borg <jakob@nym.se> | 2016-05-26 16:37:09 +0000 |
|---|---|---|
| committer | Jakob Borg <jakob@nym.se> | 2016-05-26 16:37:09 +0000 |
| commit | 4669ce07664b10db7c0f2e50828f09d36db34899 (patch) | |
| tree | 94d546a15051baa443e52103b6bc236b1e162e09 | |
| parent | 9bb5988b4ed726a7eb7662dce01580b0e82dab02 (diff) | |
debian: Rename debian directory to debtpl (fixes #3099)
To keep it out of the way for actual, real, Debian packagers
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3195
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | build.go | 2 | ||||
| -rw-r--r-- | debtpl/common/changelog (renamed from debian/common/changelog) | 0 | ||||
| -rw-r--r-- | debtpl/common/compat (renamed from debian/common/compat) | 0 | ||||
| -rw-r--r-- | debtpl/syncthing/control (renamed from debian/syncthing/control) | 0 | ||||
| -rwxr-xr-x | debtpl/syncthing/postinst (renamed from debian/syncthing/postinst) | 0 |
6 files changed, 2 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index b1fc78552..2821d6b3a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,4 @@ -syncthing -!gui/syncthing -!debian/syncthing -!Godeps/_workspace/src/github.com/syncthing +/syncthing syncthing.exe *.tar.gz *.zip @@ -438,7 +438,7 @@ func buildDeb(target target) { "date": time.Now().Format(time.RFC1123), } - debTemplateFiles := append(listFiles("debian/common"), listFiles("debian/"+target.name)...) + debTemplateFiles := append(listFiles("debtpl/common"), listFiles("debtpl/"+target.name)...) for _, file := range debTemplateFiles { tpl, err := template.New(filepath.Base(file)).ParseFiles(file) if err != nil { diff --git a/debian/common/changelog b/debtpl/common/changelog index ab5044be1..ab5044be1 100644 --- a/debian/common/changelog +++ b/debtpl/common/changelog diff --git a/debian/common/compat b/debtpl/common/compat index ec635144f..ec635144f 100644 --- a/debian/common/compat +++ b/debtpl/common/compat diff --git a/debian/syncthing/control b/debtpl/syncthing/control index f0aa38588..f0aa38588 100644 --- a/debian/syncthing/control +++ b/debtpl/syncthing/control diff --git a/debian/syncthing/postinst b/debtpl/syncthing/postinst index 742023eb1..742023eb1 100755 --- a/debian/syncthing/postinst +++ b/debtpl/syncthing/postinst |