[SCM] gwc/master: Deleted debian/patches/04_no_gnome_config.patch, changes are incorporated in 0001-buildsystem.patch.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Mar 4 13:10:02 UTC 2011


The following commit has been merged in the master branch:
commit ffd703d798b46319a7cc0638046de60f7b267ff8
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Mar 4 14:08:59 2011 +0100

    Deleted debian/patches/04_no_gnome_config.patch, changes are
    incorporated in 0001-buildsystem.patch.

diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
index 2b5b989..46708e8 100644
--- a/debian/patches/0001-buildsystem.patch
+++ b/debian/patches/0001-buildsystem.patch
@@ -1,6 +1,8 @@
 ---
- Makefile.in |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ Makefile.in  |   12 ++++++------
+ configure    |    2 +-
+ configure.in |    2 +-
+ 3 files changed, 8 insertions(+), 8 deletions(-)
 
 --- gwc.orig/Makefile.in
 +++ gwc/Makefile.in
@@ -32,3 +34,25 @@
  	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
+ 
+ 
+ UNAME_MACHINE=`uname -m`
+-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)
+ AC_SUBST(GNOME_BASE)
+ 
+ UNAME_MACHINE=`uname -m`
+-GNOME_BASE=`gnome-config --prefix`
++GNOME_BASE=`pkg-config --variable=prefix gtk+-2.0`
+ 
+ dnl Checks for libraries.
+ 
diff --git a/debian/patches/04_no_gnome_config.patch b/debian/patches/04_no_gnome_config.patch
deleted file mode 100644
index efd564f..0000000
--- a/debian/patches/04_no_gnome_config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' gwc-0.21.05/build-tree/gwc-0.21-05/configure gwc-0.21.05.new/build-tree/gwc-0.21-05/configure
---- gwc-0.21-05/configure	2006-02-04 15:22:43.000000000 -0500
-+++ gwc-0.21-05/configure	2009-01-01 19:10:17.000000000 -0500
-@@ -2250,7 +2250,7 @@
- 
- 
- UNAME_MACHINE=`uname -m`
--GNOME_BASE=`gnome-config --prefix`
-+GNOME_BASE=`pkg-config --variable=prefix gtk+-2.0`
- 
- 
- 

-- 
gwc packaging



More information about the pkg-multimedia-commits mailing list