r15901 - in /desktop/unstable/totem/debian: changelog control control.in patches/01_gecko_iceape.patch patches/70_autoconf.patch patches/series rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Mon May 12 13:13:04 UTC 2008 

Author: joss
Date: Mon May 12 13:13:04 2008
New Revision: 15901

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15901
Log:
* Build-depend on iceape-dev 1.1.9-5.
* Use the iceape gecko variant. This way it should work with both 
  gecko 1.8 and 1.9. Closes: #479344.
* 01_gecko_iceape.patch: support iceape as a valid gecko variant.
* 70_autoconf.patch: re-run autoconf on top of that.

Added:
    desktop/unstable/totem/debian/patches/01_gecko_iceape.patch
    desktop/unstable/totem/debian/patches/70_autoconf.patch
Modified:
    desktop/unstable/totem/debian/changelog
    desktop/unstable/totem/debian/control
    desktop/unstable/totem/debian/control.in
    desktop/unstable/totem/debian/patches/series
    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=15901&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog (original)
+++ desktop/unstable/totem/debian/changelog Mon May 12 13:13:04 2008
@@ -1,11 +1,19 @@
-totem (2.22.2-2) UNRELEASED; urgency=low
-
+totem (2.22.2-2) unstable; urgency=low
+
+  [ Sam Morris ]
   * Only totem-xine can satisfactorily play DVDs and VCds (it can do
     de-interlacing and menus), so update its' .desktop files to reflect this.
     This only affects nautilus 2.22, which has taken over the job of launching
     progrems when media are inserted in GNOME 2.22.
 
- -- Sam Morris <sam at robots.org.uk>  Sat, 26 Apr 2008 13:59:23 +0100
+  [ Josselin Mouette ]
+  * Build-depend on iceape-dev 1.1.9-5.
+  * Use the iceape gecko variant. This way it should work with both 
+    gecko 1.8 and 1.9. Closes: #479344.
+  * 01_gecko_iceape.patch: support iceape as a valid gecko variant.
+  * 70_autoconf.patch: re-run autoconf on top of that.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 12 May 2008 15:04:36 +0200
 
 totem (2.22.2-1) unstable; urgency=low
 

Modified: desktop/unstable/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control?rev=15901&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control (original)
+++ desktop/unstable/totem/debian/control Mon May 12 13:13:04 2008
@@ -34,8 +34,7 @@
                libmusicbrainz4-dev (>= 2.1.1-4.1),
                gnome-icon-theme (>= 2.15.90),
                libdbus-glib-1-dev (>= 0.61),
-               libxul-dev,
-               xulrunner,
+               iceape-dev (>= 1.1.9-5),
                intltool,
                autotools-dev,
                dpkg-dev (>= 1.13.19),

Modified: desktop/unstable/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control.in?rev=15901&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control.in (original)
+++ desktop/unstable/totem/debian/control.in Mon May 12 13:13:04 2008
@@ -34,8 +34,7 @@
                libmusicbrainz4-dev (>= 2.1.1-4.1),
                gnome-icon-theme (>= 2.15.90),
                libdbus-glib-1-dev (>= 0.61),
-               libxul-dev,
-               xulrunner,
+               iceape-dev (>= 1.1.9-5),
                intltool,
                autotools-dev,
                dpkg-dev (>= 1.13.19),

Added: desktop/unstable/totem/debian/patches/01_gecko_iceape.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/01_gecko_iceape.patch?rev=15901&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/01_gecko_iceape.patch (added)
+++ desktop/unstable/totem/debian/patches/01_gecko_iceape.patch Mon May 12 13:13:04 2008
@@ -1,0 +1,22 @@
+Index: totem-2.22.2/configure.in
+===================================================================
+--- totem-2.22.2.orig/configure.in	2008-05-12 15:02:18.940935777 +0200
++++ totem-2.22.2/configure.in	2008-05-12 15:10:37.900429391 +0200
+@@ -584,7 +584,7 @@ if test "$enable_browser_plugins" != "no
+ 	# backward compat
+ 	AC_ARG_WITH([mozilla],[],[with_gecko=$withval])
+ 
+-	GECKOS="xulrunner firefox mozilla-firefox seamonkey mozilla"
++	GECKOS="xulrunner firefox mozilla-firefox seamonkey mozilla iceape"
+ 	gecko=$with_gecko
+ 
+ 	if test -z "$with_gecko"; then
+@@ -615,7 +615,7 @@ if test "$enable_browser_plugins" != "no
+ 
+ 	case "$gecko" in
+ 		mozilla) MOZILLA_VERSION_MIN=1.7 ;;
+-		seamonkey) MOZILLA_VERSION_MIN=1.0 ;;
++		seamonkey|iceape) MOZILLA_VERSION_MIN=1.0 ;;
+ 		*firefox) MOZILLA_VERSION_MIN=1.0 ;;
+ 		xulrunner) MOZILLA_VERSION_MIN=1.8 ;;
+ 	esac

Added: desktop/unstable/totem/debian/patches/70_autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/70_autoconf.patch?rev=15901&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/70_autoconf.patch (added)
+++ desktop/unstable/totem/debian/patches/70_autoconf.patch Mon May 12 13:13:04 2008
@@ -1,0 +1,22 @@
+Index: totem-2.22.2/configure
+===================================================================
+--- totem-2.22.2.orig/configure	2008-05-12 15:10:22.048430159 +0200
++++ totem-2.22.2/configure	2008-05-12 15:10:49.460428383 +0200
+@@ -24601,7 +24601,7 @@ if test "${with_mozilla+set}" = set; the
+ fi
+ 
+ 
+-	GECKOS="xulrunner firefox mozilla-firefox seamonkey mozilla"
++	GECKOS="xulrunner firefox mozilla-firefox seamonkey mozilla iceape"
+ 	gecko=$with_gecko
+ 
+ 	if test -z "$with_gecko"; then
+@@ -24638,7 +24638,7 @@ echo "${ECHO_T}$gecko" >&6; }
+ 
+ 	case "$gecko" in
+ 		mozilla) MOZILLA_VERSION_MIN=1.7 ;;
+-		seamonkey) MOZILLA_VERSION_MIN=1.0 ;;
++		seamonkey|iceape) MOZILLA_VERSION_MIN=1.0 ;;
+ 		*firefox) MOZILLA_VERSION_MIN=1.0 ;;
+ 		xulrunner) MOZILLA_VERSION_MIN=1.8 ;;
+ 	esac

Modified: desktop/unstable/totem/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/series?rev=15901&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/series (original)
+++ desktop/unstable/totem/debian/patches/series Mon May 12 13:13:04 2008
@@ -1,1 +1,3 @@
+01_gecko_iceape.patch
 20_use_alternatives.patch
+70_autoconf.patch

Modified: desktop/unstable/totem/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/rules?rev=15901&op=diff
==============================================================================
--- desktop/unstable/totem/debian/rules (original)
+++ desktop/unstable/totem/debian/rules Mon May 12 13:13:04 2008
@@ -30,7 +30,7 @@
 	--sysconfdir=/etc \
 	--mandir=\$${prefix}/share/man \
 	--disable-maintainer-mode \
-	--with-gecko=xulrunner \
+	--with-gecko=iceape \
 	--disable-run-in-source-tree \
 	--disable-scrollkeeper \
 	--enable-vala

More information about the pkg-gnome-commits mailing list