[SCM] gwc/master: Deleted debian/patches/{02_destdir, 03_dont_strip}.patch, replaced by 0001-buildsystem.patch.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Mar 4 13:06:36 UTC 2011


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

    Deleted debian/patches/{02_destdir,03_dont_strip}.patch, replaced by 0001-buildsystem.patch.

diff --git a/debian/patches/02_destdir.patch b/debian/patches/02_destdir.patch
deleted file mode 100644
index 0ae8cdb..0000000
--- a/debian/patches/02_destdir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- 
--BINDIR = @bindir@
--DATADIR = @datadir@
--LIBDIR = @libdir@
-+BINDIR = $(DESTDIR)/@bindir@
-+DATADIR = $(DESTDIR)/@datadir@
-+LIBDIR = $(DESTDIR)/@libdir@
- SYSCONFDIR = @sysconfdir@
- APPNAME = gnome_wave_cleaner
--GNOME = @GNOME_BASE@
-+GNOME = $(DESTDIR)/@GNOME_BASE@
- 
- pixmapdir = $(DATADIR)/pixmaps
- HELPDIR = $(GNOME)/share/gnome/help/$(APPNAME)
-@@ -59,7 +59,7 @@
- 	install -d $(DOCDIR)
- 	install -d $(pixmapdir)
- 	install -d $(HELPDIRC)
--	install -p -s $(BINFILES) $(BINDIR)
-+	install -p -s $(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/03_dont_strip.patch b/debian/patches/03_dont_strip.patch
deleted file mode 100644
index 4ff1dcb..0000000
--- a/debian/patches/03_dont_strip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' gwc-0.21.05/build-tree/gwc-0.21-05/Makefile.in gwc-0.21.05.new/build-tree/gwc-0.21-05/Makefile.in
---- gwc-0.21-05/Makefile.in	2008-12-11 12:45:12.000000000 -0500
-+++ gwc-0.21-05/Makefile.in	2008-12-11 12:45:37.000000000 -0500
-@@ -59,7 +59,7 @@
- 	install -d $(DOCDIR)
- 	install -d $(pixmapdir)
- 	install -d $(HELPDIRC)
--	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)

-- 
gwc packaging



More information about the pkg-multimedia-commits mailing list