[SCM] gwc/master: Refresh patch

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Thu Apr 14 06:14:14 UTC 2011


The following commit has been merged in the master branch:
commit 7c920f3ee981552ef4cd2e6496c947e6c429a713
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Apr 14 08:09:32 2011 +0200

    Refresh patch

diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
index 099ac08..c4394a8 100644
--- a/debian/patches/0001-buildsystem.patch
+++ b/debian/patches/0001-buildsystem.patch
@@ -3,15 +3,11 @@ Origin: Debian
 Reviewed-by: Alessio Treglia <alessio at debian.org>
 Last-Update: 2011-03-04
 Forwarded: no
----
- Makefile.in  |   16 ++++++++--------
- configure    |    2 +-
- configure.in |    2 +-
- 3 files changed, 10 insertions(+), 10 deletions(-)
-
---- gwc.orig/Makefile.in
-+++ gwc/Makefile.in
-@@ -1,16 +1,16 @@
+Index: gwc/Makefile.in
+===================================================================
+--- gwc.orig/Makefile.in	2011-04-14 07:06:59.545341290 +0200
++++ gwc/Makefile.in	2011-04-14 07:13:42.628174811 +0200
+@@ -1,16 +1,15 @@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
  
@@ -19,11 +15,11 @@ Forwarded: no
 -DATADIR = @datadir@
 -DATAROOTDIR = @datarootdir@
 -LIBDIR = @libdir@
+-SYSCONFDIR = @sysconfdir@
 +BINDIR = $(DESTDIR)/@bindir@
 +DATADIR = $(DESTDIR)/@datadir@
 +DATAROOTDIR = $(DESTDIR)/@datarootdir@
 +LIBDIR = $(DESTDIR)/@libdir@
- SYSCONFDIR = @sysconfdir@
  APPNAME = gnome_wave_cleaner
 -GNOME = @GNOME_BASE@
 +GNOME = $(DESTDIR)/@GNOME_BASE@
@@ -34,7 +30,7 @@ Forwarded: no
  HELPDIRC = $(HELPDIR)/C
  DOCDIR = $(DATADIR)/doc/gwc
  
-@@ -47,7 +47,7 @@ EFENCE =
+@@ -47,7 +46,7 @@
  all : gwc
  
  gwc : $(OBJS) meschach.a
@@ -43,7 +39,7 @@ Forwarded: no
  
  audio_device.o : audio_device.c audio_alsa.c audio_oss.c audio_osx.c audio_pa.c
  	$(COMPILE) -c audio_device.c
-@@ -60,7 +60,7 @@ install : gwc
+@@ -60,7 +59,7 @@
  	install -d $(DOCDIR)
  	install -d $(pixmapdir)
  	install -d $(HELPDIRC)
@@ -52,24 +48,28 @@ Forwarded: no
  	install -p -m 0644 $(DOCFILES) $(DOCDIR)
  	for hf in $(HELPFILES) ; do install -p -m 0644 $(HELPFILESSRCD)/$$hf $(HELPDIRC) ; done
  	install -p -m 0644 $(pixmap_DATA) $(pixmapdir)
---- gwc.orig/configure
-+++ gwc/configure
-@@ -3098,7 +3098,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+Index: gwc/configure
+===================================================================
+--- gwc.orig/configure	2011-04-14 07:14:19.030986345 +0200
++++ gwc/configure	2011-04-14 07:16:20.299027067 +0200
+@@ -3169,7 +3169,7 @@
  
  
  UNAME_MACHINE=`uname -m`
--GNOME_BASE=`gnome-config --prefix`
+-#GNOME_BASE=`gnome-config --prefix`
 +GNOME_BASE=`pkg-config --variable=prefix gtk+-2.0`
  
  
  
---- gwc.orig/configure.in
-+++ gwc/configure.in
-@@ -26,7 +26,7 @@ AC_SUBST(UNAME_MACHINE)
+Index: gwc/configure.in
+===================================================================
+--- gwc.orig/configure.in	2011-04-14 07:17:13.641285420 +0200
++++ gwc/configure.in	2011-04-14 07:17:25.576895712 +0200
+@@ -27,7 +27,7 @@
  AC_SUBST(GNOME_BASE)
  
  UNAME_MACHINE=`uname -m`
--GNOME_BASE=`gnome-config --prefix`
+-#GNOME_BASE=`gnome-config --prefix`
 +GNOME_BASE=`pkg-config --variable=prefix gtk+-2.0`
  
  dnl Checks for libraries.

-- 
gwc packaging



More information about the pkg-multimedia-commits mailing list