[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH 3/6] debian/{control,rules}: use dpkg-vendor instead of lsb_release, drop build-dep.



Signed-off-by: Cristian Greco <cristian@regolo.cc>
---
 debian/control |    2 +-
 debian/rules   |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index a8d3a18..5bffb5b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Section: utils
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Bastian Blank <waldi@debian.org>
-Build-Depends: debhelper (>> 7), lsb-release, quilt
+Build-Depends: debhelper (>> 7), quilt
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/d-i/busybox.git
 Vcs-Browser: http://git.debian.org/?p=d-i/busybox.git
diff --git a/debian/rules b/debian/rules
index 2a00f62..ee25105 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 SOURCE := $(shell dpkg-parsechangelog | sed -ne 's,^Source: *\(.*\)$$,\1,p')
 VERSION_DEBIAN := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
 VERSION := $(shell echo "$(VERSION_DEBIAN)" | sed -e 's,^[^:]*:,,' -e 's,-[^-]*$$,,')
+VENDOR := $(shell dpkg-vendor --query vendor)
 
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
@@ -37,7 +38,7 @@ build: $(STAMPS_DIR)/build_deb $(STAMPS_DIR)/build_static $(STAMPS_DIR)/build_ud
 $(STAMPS_DIR)/build_%: DIR=$(BUILD_DIR)/build_$*
 $(STAMPS_DIR)/build_%: $(STAMPS_DIR)/setup_%
 	dh_testdir
-	$(MAKE) -C '$(DIR)' install docs/busybox.1 BB_EXTRA_VERSION="$(shell lsb_release -is) $(VERSION_DEBIAN)"
+	$(MAKE) -C '$(DIR)' install docs/busybox.1 BB_EXTRA_VERSION="$(VENDOR) $(VERSION_DEBIAN)"
 	touch $@
 
 $(STAMPS_DIR)/indepbuild_%: DIR=$(BUILD_DIR)/indepbuild_$*


Thanks,
--
Cristian Greco
GPG key ID: 0xCF4D32E4

Attachment: signature.asc
Description: PGP signature


Reply to: