r5910 - in /desktop/unstable/totem/debian: changelog patches/00list patches/10_configure-force-xulrunner.dpatch patches/11_configure-drop-mozilla-link-flags.dpatch patches/60_mandatory-relibtoolizing.dpatch rules

lool at users.alioth.debian.org lool at users.alioth.debian.org
Sat May 6 17:48:13 UTC 2006 

Author: lool
Date: Sat May  6 17:48:11 2006
New Revision: 5910

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=5910
Log:
* Add new patch to force usage of xulrunner, even if mozilla, firefox, or
  seamonkey are available; WARNING: requires relibtoolizing.
* Add new patch to stop linling against mozilla libs (-lxpcom -lplds4 -lplc4
  -lnspr4) by splitting the PKG_CHECK_MODULES calls in configure.in;
  WARNING: requires relibtoolizing.
* Relibtoolize, as required by the preceding patches.
* Use similar definitions as CDBS for DEB_MAKE_INVOKE and DEB_MAKE_ENVVARS
  and use $(DEB_MAKE_INVOKE) instead of $(MAKE) to call make, fixes warnings
  on schema installation.

Added:
    desktop/unstable/totem/debian/patches/10_configure-force-xulrunner.dpatch   (with props)
    desktop/unstable/totem/debian/patches/11_configure-drop-mozilla-link-flags.dpatch   (with props)
    desktop/unstable/totem/debian/patches/60_mandatory-relibtoolizing.dpatch   (with props)
Modified:
    desktop/unstable/totem/debian/changelog
    desktop/unstable/totem/debian/patches/00list
    desktop/unstable/totem/debian/rules

Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=5910&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog (original)
+++ desktop/unstable/totem/debian/changelog Sat May  6 17:48:11 2006
@@ -62,8 +62,23 @@
   * Install the mozilla plugin in /usr/lib/totem in totem-xine and
     totem-gstreamer, drop anything else from /usr/lib/xulrunner.
     [debian/rules]
-
- -- Loic Minier <lool at dooz.org>  Fri,  5 May 2006 23:20:00 +0200
+  * Add new patch to force usage of xulrunner, even if mozilla, firefox, or
+    seamonkey are available; WARNING: requires relibtoolizing.
+    [debian/patches/00list,
+     debian/patches/10_configure-force-xulrunner.dpatch]
+  * Add new patch to stop linling against mozilla libs (-lxpcom -lplds4 -lplc4
+    -lnspr4) by splitting the PKG_CHECK_MODULES calls in configure.in;
+    WARNING: requires relibtoolizing.
+    [debian/patches/00list,
+     debian/patches/11_configure-drop-mozilla-link-flags.dpatch]
+  * Relibtoolize, as required by the preceding patches.
+    [debian/patches/00list, debian/patches/60_mandatory-relibtoolizing.dpatch]
+  * Use similar definitions as CDBS for DEB_MAKE_INVOKE and DEB_MAKE_ENVVARS
+    and use $(DEB_MAKE_INVOKE) instead of $(MAKE) to call make, fixes warnings
+    on schema installation.
+    [debian/rules]
+
+ -- Loic Minier <lool at dooz.org>  Sat,  6 May 2006 18:38:39 +0200
 
 totem (1.2.1-4) unstable; urgency=low
 

Modified: desktop/unstable/totem/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/00list?rev=5910&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/00list (original)
+++ desktop/unstable/totem/debian/patches/00list Sat May  6 17:48:11 2006
@@ -2,4 +2,7 @@
 07_no_mms_to_mmsh_change
 08_aspect_ratio_fix
 09_play_protocol_not_listed_by_firefox
+10_configure-force-xulrunner
+11_configure-drop-mozilla-link-flags
 20_use_alternatives
+60_mandatory-relibtoolizing

Added: desktop/unstable/totem/debian/patches/10_configure-force-xulrunner.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/10_configure-force-xulrunner.dpatch?rev=5910&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/10_configure-force-xulrunner.dpatch (added)
+++ desktop/unstable/totem/debian/patches/10_configure-force-xulrunner.dpatch Sat May  6 17:48:11 2006
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_configure-force-xulrunner.dpatch by Loic Minier <lool at dooz.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad totem-1.4.0~/configure.in totem-1.4.0/configure.in
+--- totem-1.4.0~/configure.in	2006-03-13 10:33:13.000000000 +0100
++++ totem-1.4.0/configure.in	2006-05-06 17:48:58.000000000 +0200
+@@ -313,7 +313,7 @@
+ 	AC_ARG_WITH([mozilla],
+ 		AS_HELP_STRING([--with-mozilla],[Which gecko engine to use (default: autodetect)]))
+ 
+-	GECKOS="firefox mozilla-firefox seamonkey mozilla xulrunner"
++	GECKOS="xulrunner"
+ 	gecko=$with_mozilla
+ 
+ 	if test "x$gecko" = "x"; then

Propchange: desktop/unstable/totem/debian/patches/10_configure-force-xulrunner.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: desktop/unstable/totem/debian/patches/11_configure-drop-mozilla-link-flags.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/11_configure-drop-mozilla-link-flags.dpatch?rev=5910&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/11_configure-drop-mozilla-link-flags.dpatch (added)
+++ desktop/unstable/totem/debian/patches/11_configure-drop-mozilla-link-flags.dpatch Sat May  6 17:48:11 2006
@@ -1,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_configure-drop-mozilla-link-flags.dpatch by Loic Minier <lool at dooz.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad totem-1.4.0~/configure.in totem-1.4.0/configure.in
+--- totem-1.4.0~/configure.in	2006-03-13 10:33:13.000000000 +0100
++++ totem-1.4.0/configure.in	2006-05-06 18:00:34.000000000 +0200
+@@ -354,17 +354,26 @@
+ fi
+ 
+ dnl Check for mozilla CFLAGS/LDFLAGS
++dnl (Debian) Check for mozilla modules, but keep the CFLAGS and LIBS in
++dnl separate vars
++if test "x$ENABLE_MOZILLA" = "xyes" ; then
++	PKG_CHECK_MODULES([MOZILLA_NOT_LINKED],
++		[$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
++		 $MOZILLA-plugin],,
++                [ENABLE_MOZILLA=no])
++fi
++dnl (Debian) Check for other required modules, and merge CFLAGS, but not link
++dnl flags to avoid linking against -lxpcom -lplds4 -lplc4 -lnspr4
+ if test "x$ENABLE_MOZILLA" = "xyes" ; then
+ 	PKG_CHECK_MODULES([MOZILLA],
+ 		[gtk+-x11-2.0 \
+ 		 $MM \
+ 		 gthread-2.0 \
+-		 $MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+-		 $MOZILLA-plugin \
+ 		 gnome-vfs-2.0],,
+ 		[ENABLE_MOZILLA=no])
+ 
+ 	MOZILLA_LIBS="$MOZILLA_LIBS $EXTRA_BACKEND_LIBS"
++	MOZILLA_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS $MOZILLA_CFLAGS"
+ 	AC_SUBST([MOZILLA_CFLAGS])
+ 	AC_SUBST([MOZILLA_LIBS])
+ fi

Propchange: desktop/unstable/totem/debian/patches/11_configure-drop-mozilla-link-flags.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: desktop/unstable/totem/debian/patches/60_mandatory-relibtoolizing.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/60_mandatory-relibtoolizing.dpatch?rev=5910&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/60_mandatory-relibtoolizing.dpatch (added)
+++ desktop/unstable/totem/debian/patches/60_mandatory-relibtoolizing.dpatch Sat May  6 17:48:11 2006
@@ -1,0 +1,2344 @@

Propchange: desktop/unstable/totem/debian/patches/60_mandatory-relibtoolizing.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: desktop/unstable/totem/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/rules?rev=5910&op=diff
==============================================================================
--- desktop/unstable/totem/debian/rules (original)
+++ desktop/unstable/totem/debian/rules Sat May  6 17:48:11 2006
@@ -6,7 +6,12 @@
 
 # Include dpatch stuff.
 include /usr/share/dpatch/dpatch.make
+
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+
+# how to call make, similar to CDBS
+DEB_MAKE_ENVVARS += GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE)
 
 p_dir = $(CURDIR)/debian
 p_xine = totem-xine
@@ -32,28 +37,28 @@
 build-xine-stamp: patch
 	dh_testdir
 	if test -f build-gstreamer-stamp; then \
-	  $(MAKE) distclean; \
+	  $(DEB_MAKE_INVOKE) distclean; \
 	  rm -f build-gstreamer-stamp; \
 	fi
 	./configure --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --libexecdir=\$${prefix}/lib/totem --enable-mozilla --with-mozilla=xulrunner
-	$(MAKE)
+	$(DEB_MAKE_INVOKE)
 	touch build-xine-stamp
 
 build-gstreamer: build-gstreamer-stamp
 build-gstreamer-stamp: patch
 	dh_testdir
 	if test -f build-xine-stamp; then \
-	  $(MAKE) distclean; \
+	  $(DEB_MAKE_INVOKE) distclean; \
 	  rm -f build-xine-stamp; \
 	fi
 	./configure --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --libexecdir=\$${prefix}/lib/totem --enable-gstreamer --enable-mozilla --with-mozilla=xulrunner
-	$(MAKE)
+	$(DEB_MAKE_INVOKE)
 	touch build-gstreamer-stamp
 
 clean::	unpatch
 	dh_testdir
 	dh_testroot
-	-$(MAKE) distclean
+	-$(DEB_MAKE_INVOKE) distclean
 	-rm -f $(stamps_to_clean)
 	-rm -f $(files_to_clean)
 	-rm -rf $(dirs_to_clean)
@@ -67,13 +72,13 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	$(MAKE) -f debian/rules install-xine
-	$(MAKE) -f debian/rules install-gstreamer
+	$(DEB_MAKE_INVOKE) -f debian/rules install-xine
+	$(DEB_MAKE_INVOKE) -f debian/rules install-gstreamer
 	cd po; intltool-update -p
 
 install-xine: DH_OPTIONS=-p$(p_xine)
 install-xine: build-xine
-	$(MAKE) install DESTDIR=$(CURDIR)/$(build_xine)
+	$(DEB_MAKE_INVOKE) install DESTDIR=$(CURDIR)/$(build_xine)
 
 	# install the plugin in /usr/lib/totem
 	mkdir -p $(build_xine)/usr/lib/totem
@@ -95,7 +100,7 @@
 
 install-gstreamer: DH_OPTIONS=-p$(p_gstreamer)
 install-gstreamer: build-gstreamer
-	$(MAKE) install DESTDIR=$(CURDIR)/$(build_gstreamer)
+	$(DEB_MAKE_INVOKE) install DESTDIR=$(CURDIR)/$(build_gstreamer)
 
 	# install the plugin in /usr/lib/totem
 	mkdir -p $(build_gstreamer)/usr/lib/totem

More information about the Pkg-gnome-maintainers mailing list