[SCM] mixxx/master: Update 10_uptodate_configure.dpatch, rename it to 0001-update_configure.patch.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Tue Dec 27 09:44:17 UTC 2011


The following commit has been merged in the master branch:
commit 84a10d0b1a48368fed17d9e4f8f63c7a025df123
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Dec 27 10:40:43 2011 +0100

    Update 10_uptodate_configure.dpatch, rename it to 0001-update_configure.patch.

diff --git a/debian/patches/0001-update_configure.patch b/debian/patches/0001-update_configure.patch
new file mode 100644
index 0000000..e62923a
--- /dev/null
+++ b/debian/patches/0001-update_configure.patch
@@ -0,0 +1,30 @@
+Description: Patch config.sub and config.guess to use up-to-date versions.
+Author: Paul Brossier <piem at debian.org>
+Forwarded: no
+---
+ lib/gtest-1.5.0/build-aux/config.guess |    4 ++++
+ lib/gtest-1.5.0/build-aux/config.sub   |    4 ++++
+ 2 files changed, 8 insertions(+)
+
+--- mixxx.orig/lib/gtest-1.5.0/build-aux/config.guess
++++ mixxx/lib/gtest-1.5.0/build-aux/config.guess
+@@ -1,4 +1,8 @@
+ #! /bin/sh
++if [ -x /usr/share/misc/config.guess ]; then
++    exec /usr/share/misc/config.guess "$@"
++fi
++
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+--- mixxx.orig/lib/gtest-1.5.0/build-aux/config.sub
++++ mixxx/lib/gtest-1.5.0/build-aux/config.sub
+@@ -1,4 +1,8 @@
+ #! /bin/sh
++if [ -x /usr/share/misc/config.sub ]; then
++    exec /usr/share/misc/config.sub "$@"
++fi
++
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
diff --git a/debian/patches/10_uptodate_configure.dpatch b/debian/patches/10_uptodate_configure.dpatch
deleted file mode 100644
index f4af657..0000000
--- a/debian/patches/10_uptodate_configure.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_uptodate_configure.dpatch by Paul Brossier <piem at debian.org>
-##
-## DP: Patch config.sub and config.guess to use up-to-date versions
-
- at DPATCH@
---- a/lib/gtest-1.3.0/build-aux/config.sub	2009-10-14 18:29:16.000000000 +0200
-+++ b/lib/gtest-1.3.0/build-aux/config.sub	2009-10-30 11:54:06.000000000 +0100
-@@ -1,4 +1,8 @@
- #! /bin/sh
-+if [ -x /usr/share/misc/config.sub ]; then
-+    exec /usr/share/misc/config.sub "$@"
-+fi
-+
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
---- a/lib/gtest-1.3.0/build-aux/config.guess	2009-10-30 11:54:57.000000000 +0100
-+++ b/lib/gtest-1.3.0/build-aux/config.guess	2009-10-30 11:55:17.000000000 +0100
-@@ -1,4 +1,8 @@
- #! /bin/sh
-+if [ -x /usr/share/misc/config.guess ]; then
-+    exec /usr/share/misc/config.guess "$@"
-+fi
-+
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
diff --git a/debian/patches/series b/debian/patches/series
index c47d293..93eb7e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-10_uptodate_configure.dpatch
+0001-update_configure.patch
 15-various_archs_support.patch
 20_norpath.patch
 30-disable_soundsourcem4a.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 650227e..a5a7562 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -1,4 +1,4 @@
-10_uptodate_configure.dpatch
+0001-update_configure.patch
 15-various_archs_support.patch
 20_norpath.patch
 30-disable_soundsourcem4a.patch

-- 
mixxx packaging



More information about the pkg-multimedia-commits mailing list