[Pkg-mono-svn-commits] rev 3920 - in moon/trunk/debian: . patches
Jo Shields
directhex-guest at alioth.debian.org
Wed Feb 18 12:45:53 UTC 2009
Author: directhex-guest
Date: 2009-02-18 12:45:52 +0000 (Wed, 18 Feb 2009)
New Revision: 3920
Added:
moon/trunk/debian/patches/
moon/trunk/debian/patches/00list
moon/trunk/debian/patches/moon_dont_bail_on_unknown_arches.dpatch
Modified:
moon/trunk/debian/changelog
moon/trunk/debian/control
moon/trunk/debian/copyright
moon/trunk/debian/rules
Log:
[ Jo Shields ]
* debian/control,
debian/rules:
+ Add dependency autoconf et al
+ Depend on and enable dpatch
* debian/rules,
debian/patches/moon_dont_bail_on_unknown_arches.diff:
+ Patch configure.ac and re-autoconf to ensure arches other than
i386 and amd64 compile fine (LP: #330917)
* New upstream release
[Stefan Ebner]
* debian/rules: Replace deprecated dh_clean -k with dh_prep
to make lintian happy
Modified: moon/trunk/debian/changelog
===================================================================
--- moon/trunk/debian/changelog 2009-02-15 11:27:46 UTC (rev 3919)
+++ moon/trunk/debian/changelog 2009-02-18 12:45:52 UTC (rev 3920)
@@ -1,9 +1,22 @@
-moon (1.0-1) experimental; urgency=low
+moon (1.0-1) UNRELEASED; urgency=low
+ [ Jo Shields ]
+ * debian/control,
+ debian/rules:
+ + Add dependency autoconf et al
+ + Depend on and enable dpatch
+ * debian/rules,
+ debian/patches/moon_dont_bail_on_unknown_arches.diff:
+ + Patch configure.ac and re-autoconf to ensure arches other than
+ i386 and amd64 compile fine (LP: #330917)
* New upstream release
- -- Jo Shields <directhex at apebox.org> Tue, 20 Jan 2009 12:11:08 +0000
+ [Stefan Ebner]
+ * debian/rules: Replace deprecated dh_clean -k with dh_prep
+ to make lintian happy
+ -- Jo Shields <directhex at apebox.org> Wed, 18 Feb 2009 12:44:08 +0000
+
moon (1.0~beta1-1) experimental; urgency=low
[ Jo Shields ]
Modified: moon/trunk/debian/control
===================================================================
--- moon/trunk/debian/control 2009-02-15 11:27:46 UTC (rev 3919)
+++ moon/trunk/debian/control 2009-02-18 12:45:52 UTC (rev 3920)
@@ -1,13 +1,27 @@
Source: moon
Section: web
Priority: optional
-Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
Uploaders: Jo Shields <directhex at apebox.org>
Homepage: http://www.mono-project.com/Moonlight
Vcs-Svn: svn://svn.debian.org/svn/pkg-mono/moon/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-mono/moon/trunk/
Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 7), xulrunner-1.9-dev | xulrunner-dev (>= 1.9), libavcodec-dev, libgtk2.0-dev, libasound2-dev, chrpath, lsb-release, libpulse-dev, libcairo2-dev (>= 1.8)
+Build-Depends: debhelper (>= 7),
+ xulrunner-1.9-dev | xulrunner-dev (>= 1.9),
+ libavcodec-dev,
+ libgtk2.0-dev,
+ libasound2-dev,
+ chrpath,
+ lsb-release,
+ libpulse-dev,
+ libcairo2-dev (>= 1.8),
+ autoconf,
+ automake,
+ autotools-dev,
+ libtool,
+ dpatch
Package: moonlight-plugin-core
Architecture: any
Modified: moon/trunk/debian/copyright
===================================================================
--- moon/trunk/debian/copyright 2009-02-15 11:27:46 UTC (rev 3919)
+++ moon/trunk/debian/copyright 2009-02-18 12:45:52 UTC (rev 3920)
@@ -791,7 +791,7 @@
Files: debian/*
Copyright: © 2008, Christian Marillat <marillat at debian.org>
-Copyright: © 2008, Jo Shields <directhex at apebox.org>
+Copyright: © 2008-2009, Jo Shields <directhex at apebox.org>
Copyright: © 2009, Mirco Bauer <meebey at debian.org>
License: GPL
On Debian systems the full text of the GNU General Public License can be found
Added: moon/trunk/debian/patches/00list
===================================================================
--- moon/trunk/debian/patches/00list (rev 0)
+++ moon/trunk/debian/patches/00list 2009-02-18 12:45:52 UTC (rev 3920)
@@ -0,0 +1 @@
+moon_dont_bail_on_unknown_arches
Added: moon/trunk/debian/patches/moon_dont_bail_on_unknown_arches.dpatch
===================================================================
--- moon/trunk/debian/patches/moon_dont_bail_on_unknown_arches.dpatch (rev 0)
+++ moon/trunk/debian/patches/moon_dont_bail_on_unknown_arches.dpatch 2009-02-18 12:45:52 UTC (rev 3920)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## moon_dont_bail_on_unknown_arches.dpatch by Jo Shields <directhex at apebox.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change error to warning in configure, so architectures with no
+## DP: Microsoft Media Pack still compile
+
+ at DPATCH@
+diff -urNad moon-1.0.orig/configure.ac moon-1.0/configure.ac
+--- moon-1.0.orig/configure.ac 2009-02-18 09:01:10.000000000 +0000
++++ moon-1.0/configure.ac 2009-02-18 09:02:14.000000000 +0000
+@@ -543,10 +543,10 @@
+ esac
+
+ if test ${ARCH} = unknown; then
+- AC_ERROR(The codecs have not been configured to build on this architecture yet)
++ AC_WARN(The codecs have not been configured to build on this architecture yet)
+ fi
+ if test ${OSTYPE} = unknown; then
+- AC_ERROR(The codecs have not been configured to build on this operating system yet)
++ AC_WARN(The codecs have not been configured to build on this operating system yet)
+ fi
+ if test -z ${MOONLIGHT_CODEC_AVI_VERSION}; then
+ AC_ERROR(The Moonlight Pipeline ABI could not be determined)
Modified: moon/trunk/debian/rules
===================================================================
--- moon/trunk/debian/rules 2009-02-15 11:27:46 UTC (rev 3919)
+++ moon/trunk/debian/rules 2009-02-18 12:45:52 UTC (rev 3920)
@@ -14,11 +14,23 @@
XULRUNNER_19_PLUGDIR = "usr/lib/xulrunner-addons/plugins"
endif
-config.status: configure
+include /usr/share/dpatch/dpatch.make
+
+configure: config-stamp
+config-stamp: patch-stamp
dh_testdir
+
+ libtoolize
+ aclocal
+ autoconf
+ automake --add-missing --copy
+
+
./configure --prefix=/usr --with-cairo=system --with-ff3=yes --with-alsa=yes --with-pulseaudio=yes \
--with-ffmpeg=yes
+ touch $@
+
upstream_version=$(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2 | cut -d'-' -f1)
get-orig-source:
@@ -31,25 +43,27 @@
--destdir ../tarballs
build: build-stamp
-build-stamp: config.status
+build-stamp: config-stamp
dh_testdir
$(MAKE)
touch $@
-clean:
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
# Not a Mono package yet, no .wapi
# rm -rf $(MONO_SHARED_DIR)/.wapi
- rm -f build/config.make
+ rm -rf build/config.make autom4te.cache
[ ! -f Makefile ] || $(MAKE) distclean
- dh_clean
+ find . -name "Makefile.in" | xargs rm -rf
+ dh_clean configure config.sub config.guess aclocal.m4
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Mangle rpath for lintain cleanness
@@ -84,4 +98,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean clean-patched binary-indep binary-arch binary install
More information about the Pkg-mono-svn-commits
mailing list