From 4c6c8975d063f95b5f5df871c0cca93e8be64d2f Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Mon, 7 Jul 2014 04:34:35 -0400
Subject: [PATCH] * Switch from using lsb-release to dpkg-vendor to determine
distro and drop lsb-release from build-depends (Closes: #751706) - Thanks
to Peter Pentchev for the patch
---
debian/changelog | 3 +++
debian/control | 2 +-
debian/control.in | 4 ++--
debian/rules | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2156f5c..7d99004 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ python-defaults (2.7.7-1) UNRELEASED; urgency=medium
[ Scott Kitterman ]
* Fix error in pydist package relationship regex (Closes: #735163)
- Thanks to Rafael Laboissiere for the patch
+ * Switch from using lsb-release to dpkg-vendor to determine distro and drop
+ lsb-release from build-depends (Closes: #751706)
+ - Thanks to Peter Pentchev for the patch
-- Matthias Klose <doko@debian.org> Mon, 02 Jun 2014 19:54:25 +0200
diff --git a/debian/control b/debian/control
index a3efed5..77a4342 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Matthias Klose <doko@debian.org>
Uploaders: Scott Kitterman <scott@kitterman.com>, Piotr Ożarowski <piotr@debian.org>, Barry Warsaw <barry@debian.org>
Build-Depends: debhelper (>= 8~), python-docutils (>= 0.4-3),
- libhtml-tree-perl, debiandoc-sgml, lsb-release
+ libhtml-tree-perl, debiandoc-sgml
Standards-Version: 3.9.5
Homepage: http://www.python.org/
Vcs-Bzr: http://alioth.debian.org/anonscm/bzr/pkg-python/python-defaults-debian
diff --git a/debian/control.in b/debian/control.in
index 5ffad46..4a23176 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,9 +2,9 @@ Source: python-defaults
Section: python
Priority: optional
Maintainer: Matthias Klose <doko@debian.org>
-Uploaders: Scott Kitterman <scott@kitterman.com>, Piotr Ożarowski <piotr@debian.org>
+Uploaders: Scott Kitterman <scott@kitterman.com>, Piotr Ożarowski <piotr@debian.org>, Barry Warsaw <barry@debian.org>
Build-Depends: debhelper (>= 8~), python-docutils (>= 0.4-3),
- libhtml-tree-perl, debiandoc-sgml, lsb-release
+ libhtml-tree-perl, debiandoc-sgml
Standards-Version: 3.9.5
Homepage: http://www.python.org/
Vcs-Bzr: http://alioth.debian.org/anonscm/bzr/pkg-python/python-defaults-debian
diff --git a/debian/rules b/debian/rules
index e131a80..7fca98e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ changelog_values := $(shell dpkg-parsechangelog \
PKGSOURCE := $(word 1, $(changelog_values))
PKGVERSION := $(word 2, $(changelog_values))
-distribution := $(shell lsb_release -is)
+distribution := $(shell dpkg-vendor --query Vendor)
export VER=2.7
export NVER=2.8
--
GitLab