Update to SPF 2.0.

9 files changed, 17 insertions, 68 deletions

diff --git a/build b/build
index e880345..2a40656 100644..100755
--- a/build
+++ b/build
@@ -1,14 +1,6 @@
-#! /usr/bin/make -f
-
-libav libavheaders: libav.buildstamp
-
-	cd src &&\
-	./configure --disable-yasm --prefix=/usr &&\ 
-	make && make DESTDIR=$$(pwd)/../dest install
-	oh-installfiles libav libavheaders
-	oh-installdocs libav
-	oh-gencontrol libav libavheaders
-	oh-buildopk libav libavheaders
-	touch libav.buildstamp
+#!/usr/bin/make -f
 
+include ../source.mk
 
+nop:
+	@:
diff --git a/changelog b/changelog
index 048fec4..37d2e5e 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libav (10.1-1) trunk
+
+  * New upstream version.
+  * Update to SPF 2.0 and opkhelper 3.0.
+
+ -- "P. J. McDermott" <pj@pehjota.net>  Fri, 20 Jun 2014 12:50:19 -0400
+
 libav (0.8.1)
 
 	*  Inital Release
diff --git a/control b/control
index b33bad1..81209bb 100644
--- a/control
+++ b/control
@@ -1,3 +1,5 @@
-Source: libav
-Version: 0.8.1
-Maintainer: Joseph Flynn <jjf22@njit.edu>
+Maintainer: "P. J. McDermott" <pj@pehjota.net>
+Build-Depends: opkhelper-3.0,
+ libogg-dev,
+ libvorbis-dev,
+Homepage: https://libav.org/
diff --git a/copyright b/copyright
deleted file mode 100644
index 2060673..0000000
--- a/copyright
+++ /dev/null
@@ -1,42 +0,0 @@
-Upstream Source
-===============
-
-Location: <http://libav.org/download.html>
-
-Libav
------
-
-Most files in Libav are under the GNU Lesser General Public License version 2.1
-or later (LGPL v2.1+). Read the file COPYING.LGPLv2.1 for details. Some other
-files have MIT/X11/BSD-style licenses. In combination the LGPL v2.1+ applies to
-Libav.
-
-Some optional parts of Libav are licensed under the GNU General Public License
-version 2 or later (GPL v2+). See the file COPYING.GPLv2 for details. None of
-these parts are used by default, you have to explicitly pass --enable-gpl to
-configure to activate them. In this case, Libav's license changes to GPL v2+.
-
-Specifically, the GPL parts of Libav are
-
-- libpostproc
-- optional x86 optimizations in the files
-  libavcodec/x86/idct_mmx.c
-- the X11 grabber in libavdevice/x11grab.c
-
-Distribution Packaging
-======================
-
-Copyright (C) 2012 Joseph Flynn
-
-his program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-On this system, a copy of the GNU General Public License may be found at
-<file:///usr/share/common-licenses/GPL-3>.
diff --git a/format b/format
index d3827e7..cd5ac03 100644
--- a/format
+++ b/format
@@ -1 +1 @@
-1.0
+2.0
diff --git a/libav.pkg/control b/libav.pkg/control
deleted file mode 100644
index 73ba503..0000000
--- a/libav.pkg/control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: libav
-Architecture: any
-Description: libav is cross-platform solution for multimedia 
- Libav is a cross-platform solution to convert and stream audio.
diff --git a/libav.pkg/install b/libav.pkg/install
deleted file mode 100644
index 74e4e23..0000000
--- a/libav.pkg/install
+++ /dev/null
@@ -1 +0,0 @@
-/usr
diff --git a/libavheaders.pkg/control b/libavheaders.pkg/control
deleted file mode 100644
index f55d0a1..0000000
--- a/libavheaders.pkg/control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: libavheaders
-Architecture: any
-Description: This package contains headerfiles needed for libav.
- This package will contain all of the headerfiles needed for libav to work.
diff --git a/libavheaders.pkg/install b/libavheaders.pkg/install
deleted file mode 100644
index 1e79a0a..0000000
--- a/libavheaders.pkg/install
+++ /dev/null
@@ -1 +0,0 @@
-/include