[SCM] japa/master: Changed dpatch patch by quilt patch

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Tue Feb 15 00:07:44 UTC 2011


The following commit has been merged in the master branch:
commit 3d880cbf3bc4a09d6ac2660633f8b88f298fc372
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Feb 15 01:01:44 2011 +0100

    Changed dpatch patch by quilt patch

diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d55adb7..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-10makefile_destdir.dpatch
diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
new file mode 100644
index 0000000..7a20c9f
--- /dev/null
+++ b/debian/patches/01-makefile.patch
@@ -0,0 +1,13 @@
+Index: japa/Makefile
+===================================================================
+--- japa.orig/Makefile	2011-02-15 00:54:54.762053941 +0100
++++ japa/Makefile	2011-02-15 00:55:20.785555324 +0100
+@@ -33,7 +33,7 @@
+ 
+ 
+ install:	japa
+-	/usr/bin/install -m 755 japa $(PREFIX)/bin
++	/usr/bin/install -m 755 japa $(DESTDIR)/$(PREFIX)/bin
+ 
+ $(JAPA_O):	$(JAPA_H)
+ 
diff --git a/debian/patches/10makefile_destdir.dpatch b/debian/patches/10makefile_destdir.dpatch
deleted file mode 100644
index f8c7b82..0000000
--- a/debian/patches/10makefile_destdir.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10makefile_destdir.dpatch by  <Helmut Grohne <helmut at subdivi.de>>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Convert makefile to installing to $DESTDIR
-
- at DPATCH@
-diff -urNad japa-0.2.1~/Makefile japa-0.2.1/Makefile
---- japa-0.2.1~/Makefile	2007-04-19 11:18:42.000000000 +0200
-+++ japa-0.2.1/Makefile	2007-07-07 20:27:11.000000000 +0200
-@@ -33,7 +33,7 @@
- 
- 
- install:	japa
--	/usr/bin/install -m 755 japa $(PREFIX)/bin
-+	/usr/bin/install -m 755 japa $(DESTDIR)/$(PREFIX)/bin
- 
- $(JAPA_O):	$(JAPA_H)
- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d3b72df
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-makefile.patch

-- 
japa packaging



More information about the pkg-multimedia-commits mailing list