[helix-maintainers] Ubuntu helix-player 1.0.9-0ubuntu8

Tue Oct 27 11:34:02 UTC 2009

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.7
Date: Tue, 27 Oct 2009 00:24:49 +0100
Source: helix-player
Binary: helix-player mozilla-helix-player
Architecture: source
Version: 1.0.9-0ubuntu8
Distribution: karmic
Urgency: low
Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
Changed-By: Alexander Sack <asac at ubuntu.com>
Description: 
 helix-player - Helix audio and video player
 mozilla-helix-player - Helix audio and video player (browser plugin)
Launchpad-Bugs-Fixed: 455517
Changes: 
 helix-player (1.0.9-0ubuntu8) karmic; urgency=low
 .
   * fix FTBFS for gcc 4.4
     - add debian/patches/90-fix-gcc4.dpatch
     - update debian/patches/00list
   * fix FTBFS with python 2.6; force python2.4 for umake
     - update debian/rules
   * fix FTBFS because of missing sdkpath for vorbis; add
     datatype 20-vorbis-sdkpath.dpatch and also explicitly set oggvorbissdk
     environment which seems to be the right way to do that; so, after karmic
     all the SetSDKPath patch parts should be dropped
 .
 helix-player (1.0.9-0ubuntu7) karmic; urgency=low
 .
   * Fixes LP: #455517 - supersede firefox 3.0 and xulrunner-1.9 in karmic
     - update debian/control
Files: 
 0b6353e7de893c3ffd5f0e2a10e85992 1879 graphics optional helix-player_1.0.9-0ubuntu8.dsc
 9f253ed4a73af1fe38c68f49ce956f69 18844 graphics optional helix-player_1.0.9-0ubuntu8.diff.gz
Original-Maintainer: Daniel Baumann <daniel at debian.org>
-------------- next part --------------
diff -pruN 1.0.9-0ubuntu6/debian/changelog 1.0.9-0ubuntu8/debian/changelog

--- 1.0.9-0ubuntu6/debian/changelog	2009-10-27 11:14:15.000000000 +0000
+++ 1.0.9-0ubuntu8/debian/changelog	2009-10-27 11:14:12.000000000 +0000
@@ -1,3 +1,24 @@
+helix-player (1.0.9-0ubuntu8) karmic; urgency=low
+
+  * fix FTBFS for gcc 4.4
+    - add debian/patches/90-fix-gcc4.dpatch
+    - update debian/patches/00list
+  * fix FTBFS with python 2.6; force python2.4 for umake
+    - update debian/rules
+  * fix FTBFS because of missing sdkpath for vorbis; add
+    datatype 20-vorbis-sdkpath.dpatch and also explicitly set oggvorbissdk
+    environment which seems to be the right way to do that; so, after karmic
+    all the SetSDKPath patch parts should be dropped
+
+ -- Alexander Sack <asac at ubuntu.com>  Tue, 27 Oct 2009 00:24:49 +0100
+
+helix-player (1.0.9-0ubuntu7) karmic; urgency=low
+
+  * Fixes LP: #455517 - supersede firefox 3.0 and xulrunner-1.9 in karmic
+    - update debian/control 
+
+ -- Micah Gersten <launchpad at micahscomputing.com>  Mon, 26 Oct 2009 15:31:48 -0500
+
 helix-player (1.0.9-0ubuntu6) intrepid; urgency=low
 
   * add new plugin database fields Xb-Npp-Description and Xb-Npp-File
diff -pruN 1.0.9-0ubuntu6/debian/control 1.0.9-0ubuntu8/debian/control
--- 1.0.9-0ubuntu6/debian/control	2009-10-27 11:14:15.000000000 +0000
+++ 1.0.9-0ubuntu8/debian/control	2009-10-27 11:14:12.000000000 +0000
@@ -29,7 +29,7 @@ Description: Helix audio and video playe
 Package: mozilla-helix-player
 Section: web
 Architecture: i386 powerpc sparc amd64 lpia
-Depends: helix-player (= ${Source-Version}), xulrunner-1.9 | iceweasel | iceape | www-browser
+Depends: helix-player (= ${Source-Version}), xulrunner-1.9.1 | iceweasel | iceape | www-browser
 Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a 
 Xb-Npp-Name: Helix DNA Plugin - Compatible to RealPlayer G2
 Xb-Npp-MimeType: audio/x-pn-realaudio-plugin
diff -pruN 1.0.9-0ubuntu6/debian/patches/00list 1.0.9-0ubuntu8/debian/patches/00list
--- 1.0.9-0ubuntu6/debian/patches/00list	2009-10-27 11:14:15.000000000 +0000
+++ 1.0.9-0ubuntu8/debian/patches/00list	2009-10-27 11:14:12.000000000 +0000
@@ -9,3 +9,5 @@
 11-makefile-fixes
 12-umakefil-fixes
 13-installer-fixes
+20-vorbis-sdkpath
+90-fix-gcc4
diff -pruN 1.0.9-0ubuntu6/debian/patches/20-vorbis-sdkpath.dpatch 1.0.9-0ubuntu8/debian/patches/20-vorbis-sdkpath.dpatch
--- 1.0.9-0ubuntu6/debian/patches/20-vorbis-sdkpath.dpatch	1970-01-01 01:00:00.000000000 +0100
+++ 1.0.9-0ubuntu8/debian/patches/20-vorbis-sdkpath.dpatch	2009-10-27 11:14:12.000000000 +0000
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-vorbis-sdkpath.dpatch by  <asac at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad helix-player-1.0.9~/datatype/vorbis/renderer/Umakefil helix-player-1.0.9/datatype/vorbis/renderer/Umakefil
+--- helix-player-1.0.9~/datatype/vorbis/renderer/Umakefil	2004-11-24 19:07:05.000000000 +0100
++++ helix-player-1.0.9/datatype/vorbis/renderer/Umakefil	2009-10-27 01:03:47.000000000 +0100
+@@ -51,6 +51,7 @@
+ 
+ UmakefileVersion(2,1)
+ 
++SetSDKPath("oggvorbissdk", "/usr")
+ project.AddIncludes(os.path.join(GetSDKPath("oggvorbissdk"), "include"))
+ 
+ project.AddModuleIncludes(
+diff -urNad helix-player-1.0.9~/datatype/vorbis/renderer/unix.pcf helix-player-1.0.9/datatype/vorbis/renderer/unix.pcf
+--- helix-player-1.0.9~/datatype/vorbis/renderer/unix.pcf	2009-10-27 01:03:20.000000000 +0100
++++ helix-player-1.0.9/datatype/vorbis/renderer/unix.pcf	2009-10-27 01:03:23.000000000 +0100
+@@ -1,4 +1,5 @@
+ 
++SetSDKPath("oggvorbissdk", "/usr")
+ #project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libogg.a"))
+ #project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libvorbis.a"))
+ project.AddSystemLibraries("ogg", "vorbis")
diff -pruN 1.0.9-0ubuntu6/debian/patches/90-fix-gcc4.dpatch 1.0.9-0ubuntu8/debian/patches/90-fix-gcc4.dpatch
--- 1.0.9-0ubuntu6/debian/patches/90-fix-gcc4.dpatch	1970-01-01 01:00:00.000000000 +0100
+++ 1.0.9-0ubuntu8/debian/patches/90-fix-gcc4.dpatch	2009-10-27 11:14:12.000000000 +0000
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90-fix-gcc4.dpatch by  <asac at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad helix-player-1.0.9~/common/netio/platform/unix/unix_net.cpp helix-player-1.0.9/common/netio/platform/unix/unix_net.cpp
+--- helix-player-1.0.9~/common/netio/platform/unix/unix_net.cpp	2004-07-09 03:46:41.000000000 +0200
++++ helix-player-1.0.9/common/netio/platform/unix/unix_net.cpp	2009-10-27 00:24:27.000000000 +0100
+@@ -1769,7 +1769,7 @@
+     multicast_group.imr_multiaddr.s_addr = htonl(addr);
+ #ifdef _UNIX    
+     multicast_group.imr_interface.s_addr = htonl(INADDR_ANY);
+-#elif    
++#else    
+     multicast_group.imr_interface.s_addr = htonl(if_addr);
+ #endif    
+ 
+diff -urNad helix-player-1.0.9~/common/util/hxurl.cpp helix-player-1.0.9/common/util/hxurl.cpp
+--- helix-player-1.0.9~/common/util/hxurl.cpp	2004-07-09 03:48:15.000000000 +0200
++++ helix-player-1.0.9/common/util/hxurl.cpp	2009-10-27 00:24:18.000000000 +0100
+@@ -861,9 +861,8 @@
+     return strncasecmp (pszStr1, pszStr2, nChars);
+ #elif defined(_SYMBIAN)
+     return strnicmp(pszStr1, pszStr2, nChars);
+-#elif
+-#   error "undefined platform....."    
+ #else
++#   error "undefined platform....."    
+     return -1;
+ #endif
+ }
diff -pruN 1.0.9-0ubuntu6/debian/rules 1.0.9-0ubuntu8/debian/rules
--- 1.0.9-0ubuntu6/debian/rules	2009-10-27 11:14:15.000000000 +0000
+++ 1.0.9-0ubuntu8/debian/rules	2009-10-27 11:14:12.000000000 +0000
@@ -51,16 +51,19 @@ endif
 endif
 endif
 
+PYTHON := python2.4
 BUILD_ROOT:=$(CURDIR)/build
 PROFILE_ID=helix-client-all-defines-free
 MAKE_DIRS:=$(shell find $(CURDIR) -iname 'Umakefil' -printf "%h\n")
+# this should fix missing SDKPath we usually set manually
+oggvorbissdk := /usr
 
-export SYSTEM_ID BUILD_ROOT BUILDRC CFLAGS PROFILE_ID
+export SYSTEM_ID BUILD_ROOT BUILDRC CFLAGS PROFILE_ID oggvorbissdk
 
 $(MAKE_DIRS):
 	@cd $@; \
 	if [ ! -f Makefile ]; then \
-		python $(BUILD_ROOT)/bin/umake.py -trelease; \
+		$(PYTHON) $(BUILD_ROOT)/bin/umake.py -trelease; \
 	fi; \
 	if [ ! -f Makefile ]; then \
 		echo "Failure running umake in $$(pwd)"; \
