[SCM] ffmpeg2theora/master: Fixing patch.

tiago at users.alioth.debian.org tiago at users.alioth.debian.org
Sun Mar 16 22:11:36 UTC 2014


The following commit has been merged in the master branch:
commit 7c363eec619037691a87141c29cbf489cf88e9a4
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Sun Mar 16 14:01:00 2014 -0400

    Fixing patch.

diff --git a/Makefile b/Makefile
index 11dc819..d832d84 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ clean:
 	scons -c
 
 install:
-	scons install $(PREFIX)
+	scons install destdir=$(CURDIR)/debian/ffmpeg2theora prefix=/usr mandir=$(CURDIR)/debian/ffmpeg2theora/usr/share/man
 
 dist:
 	git archive --format=tar --prefix=ffmpeg2theora-`./version.sh`/ master | bzip2 >ffmpeg2theora-`./version.sh`.tar.bz2
diff --git a/debian/patches/002-Makefile.patch b/debian/patches/002-Makefile.patch
index cbcdbbf..8069fab 100644
--- a/debian/patches/002-Makefile.patch
+++ b/debian/patches/002-Makefile.patch
@@ -1,11 +1,12 @@
---- ffmpeg2theora-0.27.orig/Makefile
-+++ ffmpeg2theora-0.27/Makefile
-@@ -5,7 +5,7 @@ clean:
- 	scons -c
+--- Makefile.bli    2014-03-16 13:59:15.747686939 -0400
++++ Makefile    2014-03-16 13:59:51.080550067 -0400
+@@ -5,7 +5,7 @@
+    scons -c
  
  install:
--	scons install $(PREFIX)
-+	scons install destdir=$(CURDIR)/debian/ffmpeg2theora prefix=/usr mandir=$(CURDIR)/debian/ffmpeg2theora/usr/share/man
+-   scons install $(PREFIX)
++   scons install destdir=$(CURDIR)/debian/ffmpeg2theora prefix=/usr mandir=$(CURDIR)/debian/ffmpeg2theora/usr/share/man
  
  dist:
- 	svn export . ffmpeg2theora-`grep ^pkg_version= SConstruct | cut -d\" -f2`
+    git archive --format=tar --prefix=ffmpeg2theora-`./version.sh`/ master | bzip2 >ffmpeg2theora-`./version.sh`.tar.bz2
+

-- 
ffmpeg2theora packaging



More information about the pkg-multimedia-commits mailing list