From 4669ce07664b10db7c0f2e50828f09d36db34899 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Thu, 26 May 2016 16:37:09 +0000 Subject: [PATCH] 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 --- .gitignore | 5 +---- build.go | 2 +- {debian => debtpl}/common/changelog | 0 {debian => debtpl}/common/compat | 0 {debian => debtpl}/syncthing/control | 0 {debian => debtpl}/syncthing/postinst | 0 6 files changed, 2 insertions(+), 5 deletions(-) rename {debian => debtpl}/common/changelog (100%) rename {debian => debtpl}/common/compat (100%) rename {debian => debtpl}/syncthing/control (100%) rename {debian => debtpl}/syncthing/postinst (100%) 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 diff --git a/build.go b/build.go index 5ef28515f..176965658 100644 --- a/build.go +++ b/build.go @@ -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 similarity index 100% rename from debian/common/changelog rename to debtpl/common/changelog diff --git a/debian/common/compat b/debtpl/common/compat similarity index 100% rename from debian/common/compat rename to debtpl/common/compat diff --git a/debian/syncthing/control b/debtpl/syncthing/control similarity index 100% rename from debian/syncthing/control rename to debtpl/syncthing/control diff --git a/debian/syncthing/postinst b/debtpl/syncthing/postinst similarity index 100% rename from debian/syncthing/postinst rename to debtpl/syncthing/postinst