15 files changed, 326 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..ffa1ea5
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,58 @@
+powerline-gitstatus (1.3.2-1) unstable; urgency=medium
+
+  * New upstream version 1.3.2
+    - Fix command injection via malicious repository config (CVE-2022-42906)
+  * Bump Standards-Version to 4.6.1
+  * d/control: Remove Built-Using field as the package is Arch: all
+
+ -- Samuel Henrique <samueloph@debian.org>  Fri, 14 Oct 2022 18:58:01 +0100
+
+powerline-gitstatus (1.3.1-4) unstable; urgency=medium
+
+  [ Jérôme Charaoui ]
+  * Refresh default colorscheme patch to fix FTBFS
+
+ -- Jerome Charaoui <jerome@riseup.net>  Sat, 11 Jun 2022 09:02:29 -0400
+
+powerline-gitstatus (1.3.1-3) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * d/control: Update Maintainer field with new Debian Python Team
+    contact address.
+  * d/control: Update Vcs-* fields with new Debian Python Team Salsa
+    layout.
+
+ -- Sandro Tosi <morph@debian.org>  Wed, 15 Sep 2021 23:01:55 -0400
+
+powerline-gitstatus (1.3.1-2) unstable; urgency=medium
+
+  [ Jann Haber ]
+  * Remove python2 stuff from build-deps, since not used anyway
+    (Closes: #937314)
+
+  [ Samuel Henrique ]
+  * Use debhelper-compat 13
+  * Bump Standards-Version to 4.5.0
+  * Add d/salsa-ci.yml and d/gbp.conf
+  * d/control: Switch maintenance to PAPT team and add myself as an uploader
+
+ -- Samuel Henrique <samueloph@debian.org>  Wed, 08 Jul 2020 21:17:05 +0100
+
+powerline-gitstatus (1.3.1-1) unstable; urgency=medium
+
+  [ Daniel Baumann ]
+  * Update to debhelper compat 12
+  * Update to standards version 4.3.0
+  * Add Rules-Requires-Root and missing Built-Using
+
+  [ Jerome Charaoui ]
+  * New upstream version 1.3.1
+  * Add upstream README in package
+
+ -- Jerome Charaoui <jerome@riseup.net>  Sun, 13 Jan 2019 16:05:06 -0500
+
+powerline-gitstatus (1.2.1-1) unstable; urgency=medium
+
+  * Initial upload (Closes: #900661).
+
+ -- Jerome Charaoui <jerome@riseup.net>  Mon, 04 Jun 2018 22:05:14 -0400
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..39f849d
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,48 @@
+Source: powerline-gitstatus
+Section: python
+Priority: optional
+Maintainer: Debian Python Team <team+python@tracker.debian.org>
+Uploaders: Jerome Charaoui <jerome@riseup.net>,
+           Samuel Henrique <samueloph@debian.org>
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-python,
+ powerline (>= 2.6),
+ python3-all,
+ python3-powerline,
+ python3-setuptools,
+Build-Conflicts:
+ powerline-gitstatus,
+Rules-Requires-Root: no
+Standards-Version: 4.6.1
+Homepage: https://github.com/jaspernbrouwer/powerline-gitstatus
+Vcs-Browser: https://salsa.debian.org/python-team/packages/powerline-gitstatus
+Vcs-Git: https://salsa.debian.org/python-team/packages/powerline-gitstatus.git
+
+Package: powerline-gitstatus
+Architecture: all
+Depends:
+ git,
+ powerline ${powerline:Version},
+ python3-powerline-gitstatus,
+ ${misc:Depends},
+Description: Powerline Git segment
+ Powerline is a statusline plugin for vim, and provides statuslines and
+ prompts for several other applications, including zsh, bash, tmux,
+ IPython, Awesome and Qtile.
+ .
+ This package contains the configuration handling for powerline.
+
+Package: python3-powerline-gitstatus
+Architecture: all
+Depends:
+ python3-powerline ${powerline:Version},
+ ${misc:Depends},
+ ${python3:Depends},
+Description: Powerline Git segment for Python (3.x)
+ Powerline is a statusline plugin for vim, and provides statuslines and
+ prompts for several other applications, including zsh, bash, tmux,
+ IPython, Awesome and Qtile.
+ .
+ This package contains the Git segment for showing the status of a Git working
+ copy for Python 3.x.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..f746e57
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,33 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: powerline-gitstatus
+Upstream-Contact: Jasper N. Brouwer <jasper@nerdsweide.nl>
+Source: https://pypi.org/project/powerline-gitstatus
+
+Files: *
+Copyright: 2015-2016 Jasper N. Brouwer <jasper@nerdsweide.nl>
+License: MIT
+
+Files: debian/*
+Copyright:
+ 2010-2018 Daniel Baumann <daniel.baumann@progress-linux.org>
+ 2018 Jerome Charaoui <jerome@riseup.net>
+License: MIT
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..b43bf86
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..6cbc70d
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,19 @@
+[DEFAULT]
+debian-branch=debian/master
+pristine-tar = True
+cleaner = /bin/true
+
+[buildpackage]
+sign-tags = True
+export-dir = ../build-area/
+ignore-branch = True
+
+[import-orig]
+filter-pristine-tar = True
+
+[pq]
+patch-numbers = False
+
+[dch]
+multimaint-merge = True
+ignore-branch = True
diff --git a/debian/local/colorschemes-default.patch b/debian/local/colorschemes-default.patch
new file mode 100644
index 0000000..831ccad
--- /dev/null
+++ b/debian/local/colorschemes-default.patch
@@ -0,0 +1,28 @@
+Author: Daniel Baumann <daniel.baumann@progress-linux.org>
+Description: Adding powerline-gitstatus colors to default colorscheme.
+
+diff -Naurp powerline-gitstatus.temp/debian/powerline-gitstatus/usr/share/powerline/config_files/colorschemes/default.json powerline-gitstatus/debian/powerline-gitstatus/usr/share/powerline/config_files/colorschemes/default.json
+--- powerline-gitstatus.temp/debian/powerline-gitstatus/usr/share/powerline/config_files/colorschemes/default.json
++++ powerline-gitstatus/debian/powerline-gitstatus/usr/share/powerline/config_files/colorschemes/default.json
+@@ -52,6 +52,20 @@
+ 		"cwd:divider":                { "fg": "gray7", "bg": "gray4", "attrs": [] },
+ 		"virtualenv":                 { "fg": "white", "bg": "darkcyan", "attrs": [] },
+		"attached_clients":           { "fg": "gray8", "bg": "gray0", "attrs": [] },
+-		"workspace":                  "information:regular"
++		"workspace":                  "information:regular",
++		"gitstatus":                 { "fg": "gray8", "bg": "gray2", "attrs": [] },
++		"gitstatus_branch":          { "fg": "gray8", "bg": "gray2", "attrs": [] },
++		"gitstatus_branch_clean":    { "fg": "green", "bg": "gray2", "attrs": [] },
++		"gitstatus_branch_dirty":    { "fg": "gray8", "bg": "gray2", "attrs": [] },
++		"gitstatus_branch_detached": { "fg": "mediumpurple", "bg": "gray2", "attrs": [] },
++		"gitstatus_tag":             { "fg": "darkcyan", "bg": "gray2", "attrs": [] },
++		"gitstatus_behind":          { "fg": "gray10", "bg": "gray2", "attrs": [] },
++		"gitstatus_ahead":           { "fg": "gray10", "bg": "gray2", "attrs": [] },
++		"gitstatus_staged":          { "fg": "green", "bg": "gray2", "attrs": [] },
++		"gitstatus_unmerged":        { "fg": "brightred", "bg": "gray2", "attrs": [] },
++		"gitstatus_changed":         { "fg": "mediumorange", "bg": "gray2", "attrs": [] },
++		"gitstatus_untracked":       { "fg": "brightestorange", "bg": "gray2", "attrs": [] },
++		"gitstatus_stashed":         { "fg": "darkblue", "bg": "gray2", "attrs": [] },
++		"gitstatus:divider":         { "fg": "gray8", "bg": "gray2", "attrs": [] }
+ 	}
+ }
diff --git a/debian/local/themes-shell-default.patch b/debian/local/themes-shell-default.patch
new file mode 100644
index 0000000..008bdb9
--- /dev/null
+++ b/debian/local/themes-shell-default.patch
@@ -0,0 +1,17 @@
+Author: Daniel Baumann <daniel.baumann@progress-linux.org>
+Description: Enabling powerline-gitstatus in default shell theme.
+
+diff -Naurp powerline-gitstatus.temp/debian/powerline-gitstatus/usr/share/powerline/config_files/themes/shell/default.json powerline-gitstatus/debian/powerline-gitstatus/usr/share/powerline/config_files/themes/shell/default.json
+--- powerline-gitstatus.temp/debian/powerline-gitstatus/usr/share/powerline/config_files/themes/shell/default.json
++++ powerline-gitstatus/debian/powerline-gitstatus/usr/share/powerline/config_files/themes/shell/default.json
+@@ -17,6 +17,10 @@
+ 				"priority": 50
+ 			},
+ 			{
++				"function": "powerline_gitstatus.gitstatus",
++				"priority": 40
++			},
++			{
+ 				"function": "powerline.segments.shell.cwd",
+ 				"priority": 10
+ 			},
diff --git a/debian/local/themes-shell-default_leftonly.patch b/debian/local/themes-shell-default_leftonly.patch
new file mode 100644
index 0000000..f800700
--- /dev/null
+++ b/debian/local/themes-shell-default_leftonly.patch
@@ -0,0 +1,15 @@
+Author: Daniel Baumann <daniel.baumann@progress-linux.org>
+Description: Enabling powerline-gitstatus in default_leftonly shell theme.
+
+diff -Naurp powerline-gitstatus.temp/debian/powerline-gitstatus/usr/share/powerline/config_files/themes/shell/default_leftonly.json powerline-gitstatus/debian/powerline-gitstatus/usr/share/powerline/config_files/themes/shell/default_leftonly.json
+--- powerline-gitstatus.temp/debian/powerline-gitstatus/usr/share/powerline/config_files/themes/shell/default_leftonly.json
++++ powerline-gitstatus/debian/powerline-gitstatus/usr/share/powerline/config_files/themes/shell/default_leftonly.json
+@@ -14,7 +14,7 @@
+ 				"priority": 50
+ 			},
+ 			{
+-				"function": "powerline.segments.common.vcs.branch",
++				"function": "powerline_gitstatus.gitstatus",
+ 				"priority": 40
+ 			},
+ 			{
diff --git a/debian/powerline-gitstatus.postrm b/debian/powerline-gitstatus.postrm
new file mode 100755
index 0000000..88cb4e6
--- /dev/null
+++ b/debian/powerline-gitstatus.postrm
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+	remove)
+		for FILE in /usr/share/powerline/config_files/colorschemes/default.json \
+			    /usr/share/powerline/config_files/themes/shell/default.json \
+			    /usr/share/powerline/config_files/themes/shell/default_leftonly.json
+		do
+			DIVERTION="/usr/share/powerline-gitstatus/divert/$(basename $(dirname ${FILE}))_$(basename ${FILE}).powerline"
+
+			dpkg-divert --package powerline-gitstatus --quiet --remove --rename --divert "${DIVERTION}" "${FILE}"
+		done
+
+		rmdir -p --ignore-fail-on-non-empty /usr/share/powerline-gitstatus/divert > /dev/null 2>&1 || true
+		;;
+
+	purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+		;;
+
+	*)
+		echo "postrm called with unknown argument \`$1'" >&2
+		exit 1
+		;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/powerline-gitstatus.preinst b/debian/powerline-gitstatus.preinst
new file mode 100755
index 0000000..22d6b0f
--- /dev/null
+++ b/debian/powerline-gitstatus.preinst
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+	install)
+		mkdir -p /usr/share/powerline-gitstatus/divert
+
+		for FILE in /usr/share/powerline/config_files/colorschemes/default.json \
+			    /usr/share/powerline/config_files/themes/shell/default.json \
+			    /usr/share/powerline/config_files/themes/shell/default_leftonly.json
+		do
+			DIVERTION="/usr/share/powerline-gitstatus/divert/$(basename $(dirname ${FILE}))_$(basename ${FILE}).powerline"
+
+			dpkg-divert --package powerline-gitstatus --quiet --add --rename --divert "${DIVERTION}" "${FILE}"
+		done
+		;;
+
+	upgrade|abort-upgrade)
+
+		;;
+
+	*)
+		echo "preinst called with unknown argument \`${1}'" >&2
+		exit 1
+		;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..cf6278e
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,32 @@
+#!/usr/bin/make -f
+
+export PYBUILD_NAME=powerline-gitstatus
+
+%:
+	dh ${@} --buildsystem=pybuild --with python3
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf powerline_gitstatus.egg-info
+
+override_dh_auto_install:
+	dh_auto_install
+
+	# colorschemes/default.json
+	mkdir -p debian/powerline-gitstatus/usr/share/powerline/config_files/colorschemes
+	cp /usr/share/powerline/config_files/colorschemes/default.json debian/powerline-gitstatus/usr/share/powerline/config_files/colorschemes
+	patch -Np1 -i debian/local/colorschemes-default.patch
+
+	# themes/shell/default.json
+	mkdir -p debian/powerline-gitstatus/usr/share/powerline/config_files/themes/shell
+	cp /usr/share/powerline/config_files/themes/shell/default.json debian/powerline-gitstatus/usr/share/powerline/config_files/themes/shell
+	patch -Np1 -i debian/local/themes-shell-default.patch
+
+	# themes/shell/default_leftonly.json
+	mkdir -p debian/powerline-gitstatus/usr/share/powerline/config_files/themes/shell
+	cp /usr/share/powerline/config_files/themes/shell/default_leftonly.json debian/powerline-gitstatus/usr/share/powerline/config_files/themes/shell
+	patch -Np1 -i debian/local/themes-shell-default_leftonly.patch
+
+override_dh_gencontrol:
+	dh_gencontrol -- -Vbuilt-using="powerline (= $$(dpkg-query --show --showformat='$${source:Version}' powerline))" \
+			 -Vpowerline:Version="(>= $$(dpkg-query --show --showformat='$${source:Version}' powerline)~)"
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
new file mode 100644
index 0000000..33c3a64
--- /dev/null
+++ b/debian/salsa-ci.yml
@@ -0,0 +1,4 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..d2fbf36
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/jaspernbrouwer/powerline-gitstatus/issues
+Bug-Submit: https://github.com/jaspernbrouwer/powerline-gitstatus/issues/new
+Repository: https://github.com/jaspernbrouwer/powerline-gitstatus.git
+Repository-Browse: https://github.com/jaspernbrouwer/powerline-gitstatus
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..ac28630
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=4
+opts=filenamemangle=s/(?:.*?)?v(\d[\d.]+)\.tar\.gz/powerline-gitstatus-$1.tar.gz/ \
+  https://github.com/jaspernbrouwer/powerline-gitstatus/tags (?:.*/)?v?(\d[\d\.]*)\.tar\.gz