[SCM] gwc/master: 0001-buildsystem.patch:

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Mar 4 13:05:21 UTC 2011


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

    0001-buildsystem.patch:
    
    Parse DESTDIR and install files into the proper path.
    Don't strip binaries.

diff --git a/debian/patches/02_destdir.patch b/debian/patches/0001-buildsystem.patch
similarity index 64%
copy from debian/patches/02_destdir.patch
copy to debian/patches/0001-buildsystem.patch
index 0ae8cdb..2b5b989 100644
--- a/debian/patches/02_destdir.patch
+++ b/debian/patches/0001-buildsystem.patch
@@ -1,15 +1,20 @@
-diff -ruN gwc-0.21-05-old/Makefile.in gwc-0.21-05/Makefile.in
---- gwc-0.21-05-old/Makefile.in	2006-05-23 12:30:00.000000000 +0200
-+++ gwc-0.21-05/Makefile.in	2006-05-23 12:32:13.000000000 +0200
-@@ -1,12 +1,12 @@
+---
+ Makefile.in |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- gwc.orig/Makefile.in
++++ gwc/Makefile.in
+@@ -1,13 +1,13 @@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
  
 -BINDIR = @bindir@
 -DATADIR = @datadir@
+-DATAROOTDIR = @datarootdir@
 -LIBDIR = @libdir@
 +BINDIR = $(DESTDIR)/@bindir@
 +DATADIR = $(DESTDIR)/@datadir@
++DATAROOTDIR = $(DESTDIR)/@datarootdir@
 +LIBDIR = $(DESTDIR)/@libdir@
  SYSCONFDIR = @sysconfdir@
  APPNAME = gnome_wave_cleaner
@@ -17,13 +22,13 @@ diff -ruN gwc-0.21-05-old/Makefile.in gwc-0.21-05/Makefile.in
 +GNOME = $(DESTDIR)/@GNOME_BASE@
  
  pixmapdir = $(DATADIR)/pixmaps
- HELPDIR = $(GNOME)/share/gnome/help/$(APPNAME)
-@@ -59,7 +59,7 @@
+ HELPDIR = ${prefix}/$(GNOME)/share/gnome/help/$(APPNAME)
+@@ -60,7 +60,7 @@ install : gwc
  	install -d $(DOCDIR)
  	install -d $(pixmapdir)
  	install -d $(HELPDIRC)
 -	install -p -s $(BINFILES) $(BINDIR)
-+	install -p -s $(BINFILES) $(BINDIR)/$(APPNAME)
++	install -p $(BINFILES) $(BINDIR)/$(APPNAME)
  	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)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b5c7eee
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-buildsystem.patch

-- 
gwc packaging



More information about the pkg-multimedia-commits mailing list