[SCM] x264 packaging branch, ubuntu, updated. debian/0.svn20090621+git364d7d-0ubuntu2-10-g4af53c3

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Wed Feb 17 23:29:38 UTC 2010


The following commit has been merged in the ubuntu branch:
commit 7ab745fe217904984286b4d05b7312c4b9c689b2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Feb 13 18:24:53 2010 +0100

    remove patch 01_link.diff, does no longer apply

diff --git a/debian/patches/01_link.diff b/debian/patches/01_link.diff
deleted file mode 100644
index f6343ef..0000000
--- a/debian/patches/01_link.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: x264-0.svn20090115/Makefile
-===================================================================
---- x264-0.svn20090115.orig/Makefile	2009-01-15 18:31:49.000000000 +0100
-+++ x264-0.svn20090115/Makefile	2009-01-15 22:05:51.000000000 +0100
-@@ -80,7 +80,8 @@
- $(SONAME): .depend $(OBJS) $(OBJASM)
- 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
- 
--x264$(EXE): $(OBJCLI) libx264.a 
-+x264$(EXE): $(SONAME)
-+x264$(EXE): $(OBJCLI)
- 	$(CC) -o $@ $+ $(LDFLAGS)
- 
- checkasm: tools/checkasm.o libx264.a
diff --git a/debian/patches/series b/debian/patches/series
index 3e63de9..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-01_link.diff

-- 
x264 packaging



More information about the pkg-multimedia-commits mailing list