From: LaMont Jones <lamont@mmjgroup.com>
Date: Wed, 15 Aug 2007 06:17:40 +0000 (-0600)
Subject: changelog, and fix rules check for distro
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2691fd0f49c0af2bbeecafa65c00c5305692160;p=util-linux

changelog, and fix rules check for distro
---

diff --git a/debian/changelog b/debian/changelog
index d60a3979..d5d8a563 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+util-linux (2.13~rc3-5) unstable; urgency=low
+
+  * Fix distro check in debian/rules
+  * Use Breaks: on distros that support that in the previous release.
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 15 Aug 2007 00:32:12 -0600
+
 util-linux (2.13~rc3-4) unstable; urgency=low
 
   * Changes from upstream:
diff --git a/debian/rules b/debian/rules
index 11d029d9..9dc9afa3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 SHELL = bash
 PACKAGE = util-linux
 
-DISTRO=$(shell lsb_release -is 2>/dev/null || echo Debian);
+DISTRO=$(shell lsb_release -is 2>/dev/null || echo Debian)
 
 ifndef DEB_HOST_ARCH
 DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture)
@@ -61,7 +61,7 @@ clean:
 	find . -name '*.rej' -print0 | xargs -0r rm
 	rm -rf debian/tmp* debian/files* debian/substvars po/messages
 	rm -rf $(CFDISK_PO_DIR)
-ifeq ($(DISTRO),"Debian")
+ifeq ($(DISTRO),Debian)
 	sed '/^Breaks:/d' debian/control.in > debian/control
 else
 	cp debian/control.in debian/control
@@ -237,7 +237,7 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
 ifneq ($(arch),$(nohwclock))
 	install -m 644 debian/conffiles debian/tmp/DEBIAN/
 
-ifneq ($(DISTRO),"Debian")
+ifneq ($(DISTRO),Debian)
 	install -d -m 755 debian/tmp/lib/udev
 	install -m 755 debian/hwclock.udev debian/tmp/lib/udev/set_hwclock