[SCM] adplug/master: Refresh all patches.
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Sun Sep 26 15:46:42 UTC 2010
The following commit has been merged in the master branch:
commit f003260d418364ebcaa52017e429872016bd6b57
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sun Sep 26 11:25:49 2010 -0400
Refresh all patches.
diff --git a/debian/patches/01-include.patch b/debian/patches/01-include.patch
index bd89eca..d3187f2 100644
--- a/debian/patches/01-include.patch
+++ b/debian/patches/01-include.patch
@@ -5,9 +5,8 @@
@DPATCH@
-diff -Naur adplug-1.5.1.orig/adplugdb/adplugdb.cpp adplug-1.5.1/adplugdb/adplugdb.cpp
---- adplug-1.5.1.orig/adplugdb/adplugdb.cpp 2004-08-08 19:20:07.000000000 +0000
-+++ adplug-1.5.1/adplugdb/adplugdb.cpp 2005-10-29 15:01:35.233532720 +0000
+--- a/adplugdb/adplugdb.cpp
++++ b/adplugdb/adplugdb.cpp
@@ -26,7 +26,7 @@
#include <stdio.h>
#include <stdarg.h>
@@ -17,9 +16,8 @@ diff -Naur adplug-1.5.1.orig/adplugdb/adplugdb.cpp adplug-1.5.1/adplugdb/adplugd
#include <string>
#include <iostream>
-diff -Naur adplug-1.5.1.orig/src/adplug.cpp adplug-1.5.1/src/adplug.cpp
---- adplug-1.5.1.orig/src/adplug.cpp 2005-05-12 16:48:10.000000000 +0000
-+++ adplug-1.5.1/src/adplug.cpp 2005-10-29 15:01:45.570961192 +0000
+--- a/src/adplug.cpp
++++ b/src/adplug.cpp
@@ -20,7 +20,7 @@
*/
@@ -29,11 +27,10 @@ diff -Naur adplug-1.5.1.orig/src/adplug.cpp adplug-1.5.1/src/adplug.cpp
#include "adplug.h"
#include "debug.h"
-diff -Naur adplug-1.5.1.orig/src/database.cpp adplug-1.5.1/src/database.cpp
---- adplug-1.5.1.orig/src/database.cpp 2003-03-01 18:51:59.000000000 +0000
-+++ adplug-1.5.1/src/database.cpp 2005-10-29 15:02:52.226827960 +0000
+--- a/src/database.cpp
++++ b/src/database.cpp
@@ -21,8 +21,8 @@
- * Copyright (c) 2002, 2003 Simon Peter <dn.tlp at gmx.net>
+ * Copyright (c) 2002, 2003, 2006 Simon Peter <dn.tlp at gmx.net>
*/
-#include <binio.h>
@@ -43,9 +40,8 @@ diff -Naur adplug-1.5.1.orig/src/database.cpp adplug-1.5.1/src/database.cpp
#include <string.h>
#include "database.h"
-diff -Naur adplug-1.5.1.orig/src/database.h adplug-1.5.1/src/database.h
---- adplug-1.5.1.orig/src/database.h 2003-03-01 18:51:59.000000000 +0000
-+++ adplug-1.5.1/src/database.h 2005-10-29 15:02:36.282251904 +0000
+--- a/src/database.h
++++ b/src/database.h
@@ -26,7 +26,7 @@
#include <iostream>
@@ -55,9 +51,8 @@ diff -Naur adplug-1.5.1.orig/src/database.h adplug-1.5.1/src/database.h
class CAdPlugDatabase
{
-diff -Naur adplug-1.5.1.orig/src/dmo.cpp adplug-1.5.1/src/dmo.cpp
---- adplug-1.5.1.orig/src/dmo.cpp 2004-09-02 19:48:12.000000000 +0000
-+++ adplug-1.5.1/src/dmo.cpp 2005-10-29 15:03:10.603034352 +0000
+--- a/src/dmo.cpp
++++ b/src/dmo.cpp
@@ -26,7 +26,7 @@
*/
@@ -67,9 +62,8 @@ diff -Naur adplug-1.5.1.orig/src/dmo.cpp adplug-1.5.1/src/dmo.cpp
#include "dmo.h"
#include "debug.h"
-diff -Naur adplug-1.5.1.orig/src/fprovide.cpp adplug-1.5.1/src/fprovide.cpp
---- adplug-1.5.1.orig/src/fprovide.cpp 2003-02-17 16:42:50.000000000 +0000
-+++ adplug-1.5.1/src/fprovide.cpp 2005-10-29 15:02:43.765114336 +0000
+--- a/src/fprovide.cpp
++++ b/src/fprovide.cpp
@@ -20,8 +20,8 @@
*/
@@ -81,9 +75,8 @@ diff -Naur adplug-1.5.1.orig/src/fprovide.cpp adplug-1.5.1/src/fprovide.cpp
#include "fprovide.h"
-diff -Naur adplug-1.5.1.orig/src/fprovide.h adplug-1.5.1/src/fprovide.h
---- adplug-1.5.1.orig/src/fprovide.h 2003-01-28 13:34:35.000000000 +0000
-+++ adplug-1.5.1/src/fprovide.h 2005-10-29 15:02:27.742550136 +0000
+--- a/src/fprovide.h
++++ b/src/fprovide.h
@@ -23,7 +23,7 @@
#define H_ADPLUG_FILEPROVIDER
diff --git a/debian/patches/03-no-tests.patch b/debian/patches/03-no-tests.patch
index de82ecd..e2b723f 100644
--- a/debian/patches/03-no-tests.patch
+++ b/debian/patches/03-no-tests.patch
@@ -5,9 +5,8 @@
@DPATCH@
-diff -urNd adplug-2.0.1.orig/configure adplug-2.0.1/configure
---- adplug-2.0.1.orig/configure 2009-07-27 11:11:55.000000000 +0200
-+++ adplug-2.0.1/configure 2009-07-27 11:13:07.000000000 +0200
+--- a/configure
++++ b/configure
@@ -1528,7 +1528,7 @@
@@ -25,9 +24,8 @@ diff -urNd adplug-2.0.1.orig/configure adplug-2.0.1/configure
"adplug.pc" ) CONFIG_FILES="$CONFIG_FILES adplug.pc" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-diff -urNd adplug-2.0.1.orig/configure.in adplug-2.0.1/configure.in
---- adplug-2.0.1.orig/configure.in 2009-07-27 11:11:55.000000000 +0200
-+++ adplug-2.0.1/configure.in 2009-07-27 11:12:29.000000000 +0200
+--- a/configure.in
++++ b/configure.in
@@ -1,7 +1,7 @@
# Tell autoconf we're compiling a C++ library, using automake & libtool
AC_INIT(adplug,2.0.1)
@@ -37,9 +35,8 @@ diff -urNd adplug-2.0.1.orig/configure.in adplug-2.0.1/configure.in
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
AM_PROG_LIBTOOL
-diff -urNd adplug-2.0.1.orig/Makefile.in adplug-2.0.1/Makefile.in
---- adplug-2.0.1.orig/Makefile.in 2009-07-27 11:11:55.000000000 +0200
-+++ adplug-2.0.1/Makefile.in 2009-07-27 11:12:18.000000000 +0200
+--- a/Makefile.in
++++ b/Makefile.in
@@ -185,7 +185,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
--
adplug packaging
More information about the pkg-multimedia-commits
mailing list