diff -u swfdec-mozilla-0.4.3/debian/changelog swfdec-mozilla-0.4.3/debian/changelog --- swfdec-mozilla-0.4.3/debian/changelog +++ swfdec-mozilla-0.4.3/debian/changelog @@ -1,3 +1,19 @@ +swfdec-mozilla (0.4.3-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Build against libxul-dev | firefox-dev, to get proper dependency. + (Closes: #418837) + - debian/control: Build-depends on dpatch, libxul-dev (>= 1.8.1.4-1). + Drop iceape-dev, mozilla-dev build-deps. Drop now-unneeded libnspr4 + explicit dep. + - debian/rules: Add CDBS dpatch.mk. + - debian/patches/00_xulrunner-build: Patch configure.ac to detect + xulrunner-plugin. + - debian/patches/99_configure: autoconf diff. + - debian/shlibs.local: Drop, now unneeded. + + -- Theppitak Karoonboonyanan Tue, 29 May 2007 08:12:27 +0700 + swfdec-mozilla (0.4.3-2) unstable; urgency=low * Add shlibs.local file to fix dependencies. (Closes: #418534) diff -u swfdec-mozilla-0.4.3/debian/control swfdec-mozilla-0.4.3/debian/control --- swfdec-mozilla-0.4.3/debian/control +++ swfdec-mozilla-0.4.3/debian/control @@ -1,13 +1,13 @@ Source: swfdec-mozilla Priority: optional Maintainer: David Schleef -Build-Depends: cdbs, debhelper (>> 3.0.0), libgtk2.0-dev (>> 2.1.2), iceape-dev | mozilla-dev | firefox-dev, libcairo2-dev, zlib1g-dev, libmad0-dev, libxt-dev, liboil0.3-dev, libswfdec0.4-dev (>= 0.4.3-2), libswfdec0.4-dev (<< 0.4.4), libasound2-dev +Build-Depends: cdbs, debhelper (>> 3.0.0), libgtk2.0-dev (>> 2.1.2), libxul-dev (>= 1.8.1.4-1) | firefox-dev, libcairo2-dev, zlib1g-dev, libmad0-dev, libxt-dev, liboil0.3-dev, libswfdec0.4-dev (>= 0.4.3-2), libswfdec0.4-dev (<< 0.4.4), libasound2-dev, dpatch Standards-Version: 3.5.6 Package: swfdec-mozilla Section: utils Architecture: any -Depends: ${shlibs:Depends}, libnspr4 +Depends: ${shlibs:Depends} Provides: swf-player Replaces: swf-player Conflicts: swf-player diff -u swfdec-mozilla-0.4.3/debian/rules swfdec-mozilla-0.4.3/debian/rules --- swfdec-mozilla-0.4.3/debian/rules +++ swfdec-mozilla-0.4.3/debian/rules @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/dpatch.mk DEB_CONFIGURE_EXTRA_FLAGS := --enable-static reverted: --- swfdec-mozilla-0.4.3/debian/shlibs.local +++ swfdec-mozilla-0.4.3.orig/debian/shlibs.local @@ -1,3 +0,0 @@ -libplds4 none libnspr4 -libnspr4 none libnspr4 -libplc4 none libnspr4 only in patch2: unchanged: --- swfdec-mozilla-0.4.3.orig/debian/patches/10_xulrunner-build.dpatch +++ swfdec-mozilla-0.4.3/debian/patches/10_xulrunner-build.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_xulrunner-build.patch.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add xulrunner build support + +@DPATCH@ + +diff -Nur swfdec-mozilla-0.4.3/configure.ac swfdec-mozilla-0.4.3.new/configure.ac +--- swfdec-mozilla-0.4.3/configure.ac 2007-03-22 23:31:49.000000000 +0700 ++++ swfdec-mozilla-0.4.3.new/configure.ac 2007-04-28 14:02:12.000000000 +0700 +@@ -115,6 +115,10 @@ + PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, HAVE_MOZILLA=yes, HAVE_MOZILLA=no) + MOZILLA_DIR=mozilla + if test "$HAVE_MOZILLA" = no ; then ++ PKG_CHECK_MODULES(MOZILLA, xulrunner-plugin, HAVE_MOZILLA=yes, HAVE_MOZILLA=no) ++ MOZILLA_DIR=xulrunner ++fi ++if test "$HAVE_MOZILLA" = no ; then + PKG_CHECK_MODULES(MOZILLA, firefox-plugin, HAVE_MOZILLA=yes, HAVE_MOZILLA=no) + MOZILLA_DIR=mozilla-firefox + fi only in patch2: unchanged: --- swfdec-mozilla-0.4.3.orig/debian/patches/99_configure.dpatch +++ swfdec-mozilla-0.4.3/debian/patches/99_configure.dpatch @@ -0,0 +1,92 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 99_configure.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: autoconf + +@DPATCH@ + +diff -Nur swfdec-mozilla-0.4.3/configure swfdec-mozilla-0.4.3.new/configure +--- swfdec-mozilla-0.4.3/configure 2007-03-22 23:32:05.000000000 +0700 ++++ swfdec-mozilla-0.4.3.new/configure 2007-04-28 14:10:05.000000000 +0700 +@@ -21740,6 +21740,80 @@ + pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "xulrunner-plugin") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-plugin" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$MOZILLA_LIBS"; then ++ pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "xulrunner-plugin") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "xulrunner-plugin" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xulrunner-plugin"` ++ else ++ MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xulrunner-plugin"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$MOZILLA_PKG_ERRORS" >&5 ++ ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ HAVE_MOZILLA=no ++elif test $pkg_failed = untried; then ++ HAVE_MOZILLA=no ++else ++ MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS ++ MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ HAVE_MOZILLA=yes ++fi ++ MOZILLA_DIR=xulrunner ++fi ++if test "$HAVE_MOZILLA" = no ; then ++ ++pkg_failed=no ++{ echo "$as_me:$LINENO: checking for MOZILLA" >&5 ++echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$MOZILLA_CFLAGS"; then ++ pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin\"") >&5 + ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5 + ac_status=$? only in patch2: unchanged: --- swfdec-mozilla-0.4.3.orig/debian/patches/00list +++ swfdec-mozilla-0.4.3/debian/patches/00list @@ -0,0 +1,2 @@ +10_xulrunner-build +99_configure