From 15fb83fde9411e5f2c3694fd0a2f7023ce12231c Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 13 Jan 2016 00:15:40 +0100 Subject: imported patch to allow dashes in package names --- debian/changelog | 10 +++++++++- debian/patches/allow-dashes-in-repository-names.patch | 13 +++++++++++++ debian/patches/series | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 debian/patches/allow-dashes-in-repository-names.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index fc4c587..67624f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,12 @@ -vanity (0.1.1-2) UNRELEASED; urgency=medium +vanity (0.1.1-3) UNRELEASED; urgency=medium + + * package now actually builds from source + * fixed systemd service file handling + * added patch to allow dashes in package names + + -- Christian Pointner Wed, 13 Jan 2016 00:03:24 +0100 + +vanity (0.1.1-2) unstable; urgency=medium * create special user for vanity diff --git a/debian/patches/allow-dashes-in-repository-names.patch b/debian/patches/allow-dashes-in-repository-names.patch new file mode 100644 index 0000000..9fe5994 --- /dev/null +++ b/debian/patches/allow-dashes-in-repository-names.patch @@ -0,0 +1,13 @@ +This allows '-' for package names +see: https://github.com/xiam/vanity/pull/6 +--- a/main.go ++++ b/main.go +@@ -24,7 +24,7 @@ + repoRootFlag = flag.String("repo-root", "", "Git repository root URL (e.g.: https://github.com/upper).") + ) + +-var packagePattern = regexp.MustCompile(`^/([a-zA-Z0-9]+)\.?(v[1-9][0-9]*)?(.*)$`) ++var packagePattern = regexp.MustCompile(`^/([-a-zA-Z0-9]+)\.?(v[1-9][0-9]*)?(.*)$`) + + var httpClient = &http.Client{Timeout: 10 * time.Second} + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..f599fcd --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +allow-dashes-in-repository-names.patch -- cgit v1.2.3