Re: [PATCH] mesa: do not strip the same packages twice
On Sat, May 8, 2010 at 12:34 PM, Julien Cristau <jcristau@debian.org> wrote:
> Hi Tormod,
>
> On Thu, Apr 22, 2010 at 22:29:41 +0200, Tormod Volden wrote:
>
>> From: Tormod Volden <debian.tormod@gmail.com>
>>
>> ---
>> debian/rules | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/debian/rules b/debian/rules
>> index 8a22ea8..76bed7d 100755
>> --- a/debian/rules
>> +++ b/debian/rules
>> @@ -233,7 +233,7 @@ binary-arch: install
>> dh_strip -plibgl1-mesa-swx11 --dbg-package=libgl1-mesa-swx11-dbg
>> dh_strip -plibgl1-mesa-glx --dbg-package=libgl1-mesa-glx-dbg
>> dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg
>> - dh_strip -s
>> + dh_strip -s --remaining-packages
>> dh_compress -s
>> dh_fixperms -s
>> dh_makeshlibs -s
>
> --remaining-packages needs a versioned build-dep on debhelper 7.2.7.
> With that added, ack for the experimental branch.
>
> Thanks,
> Julien
>
Thanks, I will go ahead and push this to git then.
Tormod
From be3ebc7459b6b1c62b4f996e5c36a9c23ce6f132 Mon Sep 17 00:00:00 2001
From: Tormod Volden <debian.tormod@gmail.com>
Date: Thu, 22 Apr 2010 22:02:44 +0200
Subject: [PATCH] Do not strip the same packages twice
---
debian/changelog | 6 ++++++
debian/control | 2 +-
debian/rules | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 65ffa31..b426834 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.8.1-2) UNRELEASED; urgency=low
+
+ * debian/rules: Do not strip the same packages twice
+
+ -- Tormod Volden <debian.tormod@gmail.com> Sun, 09 May 2010 12:37:53 +0200
+
mesa (7.8.1-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index bbff145..0e61cac 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 6.0.7), quilt (>= 0.40), pkg-config,
+Build-Depends: debhelper (>= 7.2.7), quilt (>= 0.40), pkg-config,
libdrm-dev (>= 2.4.19) [!hurd-i386], libx11-dev, xutils-dev,
x11proto-gl-dev (>= 1.4.11), libxxf86vm-dev,
libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.13.19), libxfixes-dev,
diff --git a/debian/rules b/debian/rules
index 8a22ea8..76bed7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -233,7 +233,7 @@ binary-arch: install
dh_strip -plibgl1-mesa-swx11 --dbg-package=libgl1-mesa-swx11-dbg
dh_strip -plibgl1-mesa-glx --dbg-package=libgl1-mesa-glx-dbg
dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg
- dh_strip -s
+ dh_strip -s --remaining-packages
dh_compress -s
dh_fixperms -s
dh_makeshlibs -s
--
1.7.0.4
Reply to: