--- ogmrip-mpeg-0.2.orig/debian/compat +++ ogmrip-mpeg-0.2/debian/compat @@ -0,0 +1 @@ +7 --- ogmrip-mpeg-0.2.orig/debian/rules +++ ogmrip-mpeg-0.2/debian/rules @@ -0,0 +1,82 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +else + CROSS= --build $(DEB_BUILD_GNU_TYPE) +endif + +configure: configure-stamp +configure-stamp: debian/stamp-patched + dh_testdir + + dh_autoreconf + + ./configure $(CROSS) --prefix=/usr CFLAGS="$(CFLAGS)" --disable-static + + touch $@ + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + + $(MAKE) + + touch $@ + +clean: + dh_testdir + dh_testroot + + dh_autoreconf_clean + + rm -f build-stamp configure-stamp + + [ ! -f Makefile ] || $(MAKE) distclean + + debian/rules unpatch + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + $(MAKE) DESTDIR=$(CURDIR)/debian/ogmrip-mpeg install + +# find debian/ogmrip-mpeg/usr/lib/ogmrip -name *.a |xargs rm + find debian/ogmrip-mpeg/usr/lib/ogmrip -name *.la |xargs rm + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- ogmrip-mpeg-0.2.orig/debian/control +++ ogmrip-mpeg-0.2/debian/control @@ -0,0 +1,17 @@ +Source: ogmrip-mpeg +Section: graphics +Priority: extra +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Christian Marillat +Bugs: mailto:marillat@debian.org +Homepage: http://ogmrip.sourceforge.net/en/plugins.html +Standards-Version: 3.8.2 +Build-Depends: debhelper (>= 7), libogmrip-dev (>= 0.13.0-0.2), quilt, dh-autoreconf + +Package: ogmrip-mpeg +Architecture: any +Depends: ${shlibs:Depends}, ogmrip, mjpegtools +Description: Mpeg-1 and Mpeg-2 support for ogmrip + This plugin provides support for the Mpeg-1 and Mpeg-2 video codecs and the + Mpeg container. It can be used to author DVDs (support for VCDs and SVCDs + will be added later). --- ogmrip-mpeg-0.2.orig/debian/copyright +++ ogmrip-mpeg-0.2/debian/copyright @@ -0,0 +1,22 @@ +This package was debianized by Christian Marillat on +Mon, 25 Aug 2008 14:43:28 +0200. + +It was downloaded from http://ogmrip.sourceforge.net/en/plugins.html + +Upstream Author: + + Olivier Rolland + +Copyright: + + Copyright © 2008-2009 Olivier Rolland + +License: + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA. + +The Debian packaging is (C) 2008, Christian Marillat and +is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'. --- ogmrip-mpeg-0.2.orig/debian/changelog +++ ogmrip-mpeg-0.2/debian/changelog @@ -0,0 +1,45 @@ +ogmrip-mpeg (0.2-0.2ubuntu1) oneiric; urgency=low + + * debian/patches: + - 01_configure.diff: Disable, use dh-autoreconf. + - 02_configure_relax.patch: Remove Werror and check for mplex to fix FTBFS + (LP: #831272). + * debian/rules: + - Use dh-autoreconf. + * debian/control: + - Build-depends on dh-autoreconf. + + -- Julien Lavergne Tue, 13 Sep 2011 01:03:37 +0200 + +ogmrip-mpeg (0.2-0.2) unstable; urgency=low + + * Build with --disable-static. + + -- Christian Marillat Sun, 09 Aug 2009 22:51:05 +0200 + +ogmrip-mpeg (0.2-0.1) unstable; urgency=low + + * Remove libdvdred-dev from Build-Depends and update libogmrip-dev version + to 0.13.0-0.2 + + -- Christian Marillat Mon, 20 Jul 2009 13:13:56 +0200 + +ogmrip-mpeg (0.2-0.0) unstable; urgency=low + + * New upstream release. + * New patch to remove mplex check in configure. + + -- Christian Marillat Mon, 20 Jul 2009 10:07:41 +0200 + +ogmrip-mpeg (0.1-0.1) unstable; urgency=low + + * Rebuild agaisnt latest libdvdread-dev. + + -- Christian Marillat Sat, 07 Mar 2009 11:05:03 +0100 + +ogmrip-mpeg (0.1-0.0) unstable; urgency=low + + * Initial release. + + -- Christian Marillat Mon, 25 Aug 2008 14:43:28 +0200 + --- ogmrip-mpeg-0.2.orig/debian/watch +++ ogmrip-mpeg-0.2/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://sf.net/ogmrip/ogmrip-mpeg-(.*)\.tar\.gz --- ogmrip-mpeg-0.2.orig/debian/patches/series +++ ogmrip-mpeg-0.2/debian/patches/series @@ -0,0 +1 @@ +02_configure_relax.patch --- ogmrip-mpeg-0.2.orig/debian/patches/01_configure.diff +++ ogmrip-mpeg-0.2/debian/patches/01_configure.diff @@ -0,0 +1,60 @@ +Index: ogmrip-mpeg-0.2/configure +=================================================================== +--- ogmrip-mpeg-0.2.orig/configure 2009-07-20 10:05:05.000000000 +0200 ++++ ogmrip-mpeg-0.2/configure 2009-07-20 10:05:27.000000000 +0200 +@@ -11644,55 +11644,6 @@ + + OGMRIP_PREFIX=`$PKG_CONFIG --variable=prefix ogmrip` + +- +- +-# Extract the first word of "mplex", so it can be a program name with args. +-set dummy mplex; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_MPLEX_PROG+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $MPLEX_PROG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_MPLEX_PROG="$MPLEX_PROG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_MPLEX_PROG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-MPLEX_PROG=$ac_cv_path_MPLEX_PROG +-if test -n "$MPLEX_PROG"; then +- { $as_echo "$as_me:$LINENO: result: $MPLEX_PROG" >&5 +-$as_echo "$MPLEX_PROG" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-if test x"$MPLEX_PROG" = x; then +- { { $as_echo "$as_me:$LINENO: error: Unable to find mplex in the PATH. You need mplex to use OGMRip Mpeg. Find it on http://mjpeg.sourceforge.net/" >&5 +-$as_echo "$as_me: error: Unable to find mplex in the PATH. You need mplex to use OGMRip Mpeg. Find it on http://mjpeg.sourceforge.net/" >&2;} +- { (exit 1); exit 1; }; } +-fi +- +- + # Check whether --enable-ogmrip-gtk-support was given. + if test "${enable_ogmrip_gtk_support+set}" = set; then + enableval=$enable_ogmrip_gtk_support; have_ogmrip_gtk_support="$enableval" --- ogmrip-mpeg-0.2.orig/debian/patches/02_configure_relax.patch +++ ogmrip-mpeg-0.2/debian/patches/02_configure_relax.patch @@ -0,0 +1,27 @@ +Index: ogmrip-mpeg-0.2/configure.in +=================================================================== +--- ogmrip-mpeg-0.2.orig/configure.in 2011-09-12 22:33:23.000000000 +0200 ++++ ogmrip-mpeg-0.2/configure.in 2011-09-12 22:33:38.000000000 +0200 +@@ -18,7 +18,7 @@ + + AM_MAINTAINER_MODE + +-CFLAGS="$CFLAGS -I/usr/local/include -Wall -Werror -I.." ++CFLAGS="$CFLAGS -I/usr/local/include -Wall -I.." + LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/pkg/lib" + + dnl ************************************************************** +@@ -37,13 +37,6 @@ + + dnl ************************************************************** + +-AC_PATH_PROG(MPLEX_PROG, mplex) +-if test x"$MPLEX_PROG" = x; then +- AC_MSG_ERROR(Unable to find mplex in the PATH. You need mplex to use OGMRip Mpeg. Find it on http://mjpeg.sourceforge.net/) +-fi +- +-dnl ************************************************************** +- + AC_ARG_ENABLE(ogmrip-gtk-support, + AC_HELP_STRING([--disable-ogmrip-gtk-support], [disable OGMRip GTK+ support]), + [have_ogmrip_gtk_support="$enableval"], [have_ogmrip_gtk_support="yes"])