Bug#689089: Patches for libglu 9.0.0-2.1 NMU
Hi maintainers,
Attached are my local commits to the debian-unstable branch for the
libglu 9.0.0-2.1 NMU.
Regards,
--
Sam.
>From dbe91cb35de027cbcfe98a354edfe7d496fc9a01 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Sun, 13 Sep 2015 16:00:09 +0200
Subject: [PATCH 1/3] Add multi-arch support. Simple fix provided by Francois
Gouget.
To: 689089@bugs.debian.org
Signed-off-by: Sam Hocevar <sam@hocevar.net>
---
debian/changelog | 9 +++++++++
debian/control | 5 +++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index db122bc..c7e58de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libglu (9.0.0-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+
+ * Add multi-arch support. Simple fix provided by Francois Gouget
+ (Closes: #689089).
+
+ -- Sam Hocevar <sho@debian.org> Sun, 13 Sep 2015 15:59:01 +0200
+
libglu (9.0.0-2) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 33b2e79..0d9cdd2 100644
--- a/debian/control
+++ b/debian/control
@@ -15,14 +15,14 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libglu.git
Package: libglu1-mesa
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends:
${shlibs:Depends},
${misc:Depends},
Provides: libglu1
Conflicts: mesag3 (<< 5.0.0-1), xlibmesa3, libglu1
Replaces: libglu1
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
Description: Mesa OpenGL utility library (GLU)
GLU offers simple interfaces for building mipmaps; checking for the
presence of extensions in the OpenGL (or other libraries which follow
@@ -40,6 +40,7 @@ Description: Mesa OpenGL utility library (GLU)
Package: libglu1-mesa-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends:
libglu1-mesa (= ${binary:Version}),
libgl1-mesa-dev | libgl-dev,
--
2.5.1
>From db1642e273d9c5714e60be35c47eeadfa3c3598f Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Sun, 13 Sep 2015 18:17:54 +0200
Subject: [PATCH 2/3] Bump standards-version. No changes required.
To: 689089@bugs.debian.org
Signed-off-by: Sam Hocevar <sam@hocevar.net>
---
debian/changelog | 1 +
debian/control | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index c7e58de..1280ce7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libglu (9.0.0-2.1) UNRELEASED; urgency=medium
* Non-maintainer upload.
+ * Bump standards-version. No changes required.
* Add multi-arch support. Simple fix provided by Francois Gouget
(Closes: #689089).
diff --git a/debian/control b/debian/control
index 0d9cdd2..7ba9abb 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: graphics
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
-Standards-Version: 3.9.3
+Standards-Version: 3.9.6
Build-Depends:
debhelper (>= 9),
dh-autoreconf,
--
2.5.1
>From bd1792c7906abd3845922f8aceac564bd5537266 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Sun, 13 Sep 2015 18:20:35 +0200
Subject: [PATCH 3/3] Upload to unstable.
To: 689089@bugs.debian.org
Signed-off-by: Sam Hocevar <sam@hocevar.net>
---
debian/changelog | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1280ce7..826e27b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libglu (9.0.0-2.1) UNRELEASED; urgency=medium
+libglu (9.0.0-2.1) unstable; urgency=medium
* Non-maintainer upload.
@@ -6,7 +6,7 @@ libglu (9.0.0-2.1) UNRELEASED; urgency=medium
* Add multi-arch support. Simple fix provided by Francois Gouget
(Closes: #689089).
- -- Sam Hocevar <sho@debian.org> Sun, 13 Sep 2015 15:59:01 +0200
+ -- Sam Hocevar <sho@debian.org> Sun, 13 Sep 2015 18:20:21 +0200
libglu (9.0.0-2) unstable; urgency=low
--
2.5.1
Reply to: