[helix-maintainers] Ubuntu helix-player 1.0.9-0ubuntu4
Ubuntu Merge-o-Matic
mom at ubuntu.com
Wed Nov 21 03:29:41 UTC 2007
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: Wed, 21 Nov 2007 12:02:37 +1100
Source: helix-player
Binary: mozilla-helix-player helix-player
Architecture: source
Version: 1.0.9-0ubuntu4
Distribution: hardy
Urgency: low
Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
Changed-By: Steve Kowalik <stevenk at ubuntu.com>
Description:
helix-player - Helix audio and video player
mozilla-helix-player - Helix audio and video player (browser plugin)
Changes:
helix-player (1.0.9-0ubuntu4) hardy; urgency=low
.
* Grumble. *Properly* remove empty .po files during install.
* Hack 06-amd64 since sem_t is a union on all arches, not just amd64 and
i386.
Files:
f78ee99a29b5cc5a1d6fdf87d6feb421 817 graphics optional helix-player_1.0.9-0ubuntu4.dsc
6bd520e199df28d7b674f2aa38aaa968 17866 graphics optional helix-player_1.0.9-0ubuntu4.diff.gz
Original-Maintainer: Daniel Baumann <daniel at debian.org>
-------------- next part --------------
diff -pruN 1.0.9-0ubuntu3/debian/changelog 1.0.9-0ubuntu4/debian/changelog
--- 1.0.9-0ubuntu3/debian/changelog 2007-11-21 03:11:54.000000000 +0000
+++ 1.0.9-0ubuntu4/debian/changelog 2007-11-21 03:11:52.000000000 +0000
@@ -1,3 +1,11 @@
+helix-player (1.0.9-0ubuntu4) hardy; urgency=low
+
+ * Grumble. *Properly* remove empty .po files during install.
+ * Hack 06-amd64 since sem_t is a union on all arches, not just amd64 and
+ i386.
+
+ -- Steve Kowalik <stevenk at ubuntu.com> Wed, 21 Nov 2007 12:02:37 +1100
+
helix-player (1.0.9-0ubuntu3) hardy; urgency=low
* Remove empty .po files during install.
diff -pruN 1.0.9-0ubuntu3/debian/patches/06-amd64.dpatch 1.0.9-0ubuntu4/debian/patches/06-amd64.dpatch
--- 1.0.9-0ubuntu3/debian/patches/06-amd64.dpatch 2007-11-21 03:11:54.000000000 +0000
+++ 1.0.9-0ubuntu4/debian/patches/06-amd64.dpatch 2007-11-21 03:11:52.000000000 +0000
@@ -4,10 +4,9 @@
## DP: AMD64 Portability Bugs
@DPATCH@
-
-diff -Naur helix-player-1.0.7.orig/audio/fixptutil/pub/math64.h helix-player-1.0.7/audio/fixptutil/pub/math64.h
---- helix-player-1.0.7.orig/audio/fixptutil/pub/math64.h 2004-09-17 18:22:38.000000000 +0000
-+++ helix-player-1.0.7/audio/fixptutil/pub/math64.h 2006-04-19 05:29:23.407160712 +0000
+diff -urNad helix-player-1.0.9~/audio/fixptutil/pub/math64.h helix-player-1.0.9/audio/fixptutil/pub/math64.h
+--- helix-player-1.0.9~/audio/fixptutil/pub/math64.h 2007-11-08 05:03:01.000000000 +1100
++++ helix-player-1.0.9/audio/fixptutil/pub/math64.h 2007-11-21 11:25:47.000000000 +1100
@@ -124,7 +124,7 @@
// GCC / i386
///////////////////////////////////////////////////////////////////////////////////////
@@ -26,10 +25,10 @@ diff -Naur helix-player-1.0.7.orig/audio
///////////////////////////////////////////////////////////////////////////////////////
// Sun native compiler / Sparc
-diff -Naur helix-player-1.0.7.orig/build/umakecf/linux-2.6-glibc23-amd64.cf helix-player-1.0.7/build/umakecf/linux-2.6-glibc23-amd64.cf
---- helix-player-1.0.7.orig/build/umakecf/linux-2.6-glibc23-amd64.cf 2005-10-20 23:11:58.000000000 +0000
-+++ helix-player-1.0.7/build/umakecf/linux-2.6-glibc23-amd64.cf 2006-04-19 05:29:56.760090296 +0000
-@@ -63,8 +63,8 @@
+diff -urNad helix-player-1.0.9~/build/umakecf/linux-2.6-glibc23-amd64.cf helix-player-1.0.9/build/umakecf/linux-2.6-glibc23-amd64.cf
+--- helix-player-1.0.9~/build/umakecf/linux-2.6-glibc23-amd64.cf 2006-04-25 09:34:08.000000000 +1000
++++ helix-player-1.0.9/build/umakecf/linux-2.6-glibc23-amd64.cf 2007-11-21 11:25:47.000000000 +1100
+@@ -75,8 +75,8 @@
platform.cc.args["default"] = platform.cc.args["default"] + \
" -m64 -D__amd64__"
@@ -40,9 +39,9 @@ diff -Naur helix-player-1.0.7.orig/build
# platform defines
project.AddDefines("_LITTLE_ENDIAN")
-diff -Naur helix-player-1.0.7.orig/common/import/gecko-sdk/nspr/include/prcpucfg.h helix-player-1.0.7/common/import/gecko-sdk/nspr/include/prcpucfg.h
---- helix-player-1.0.7.orig/common/import/gecko-sdk/nspr/include/prcpucfg.h 2004-12-22 20:00:40.000000000 +0000
-+++ helix-player-1.0.7/common/import/gecko-sdk/nspr/include/prcpucfg.h 2006-04-19 05:36:34.901563592 +0000
+diff -urNad helix-player-1.0.9~/common/import/gecko-sdk/nspr/include/prcpucfg.h helix-player-1.0.9/common/import/gecko-sdk/nspr/include/prcpucfg.h
+--- helix-player-1.0.9~/common/import/gecko-sdk/nspr/include/prcpucfg.h 2004-12-23 07:00:40.000000000 +1100
++++ helix-player-1.0.9/common/import/gecko-sdk/nspr/include/prcpucfg.h 2007-11-21 11:25:47.000000000 +1100
@@ -136,6 +136,52 @@
#define PR_BYTES_PER_WORD_LOG2 3
#define PR_BYTES_PER_DWORD_LOG2 3
@@ -96,28 +95,32 @@ diff -Naur helix-player-1.0.7.orig/commo
#elif defined(__ia64__)
#define IS_LITTLE_ENDIAN 1
-diff -Naur helix-player-1.0.7.orig/common/system/pub/platform/unix/pthreadthreads.h helix-player-1.0.7/common/system/pub/platform/unix/pthreadthreads.h
---- helix-player-1.0.7.orig/common/system/pub/platform/unix/pthreadthreads.h 2004-07-09 01:43:45.000000000 +0000
-+++ helix-player-1.0.7/common/system/pub/platform/unix/pthreadthreads.h 2006-04-19 05:37:52.293798184 +0000
+diff -urNad helix-player-1.0.9~/common/system/pub/platform/unix/pthreadthreads.h helix-player-1.0.9/common/system/pub/platform/unix/pthreadthreads.h
+--- helix-player-1.0.9~/common/system/pub/platform/unix/pthreadthreads.h 2004-07-09 11:43:45.000000000 +1000
++++ helix-player-1.0.9/common/system/pub/platform/unix/pthreadthreads.h 2007-11-21 11:27:03.000000000 +1100
@@ -102,10 +102,15 @@
#ifndef _MAC_UNIX
-+#if defined(__amd64__) || defined(__i386__)
+-struct HXsem_t : public sem_t
+-{
+- char padding[64]; /* Flawfinder: ignore */ // different linux versions have different binary reps blechhhh!
+-};
++/* #if defined(__amd64__) || defined(__i386__) */
+// sem_t is a union, and therefore can't be used as a base class.
+typedef sem_t HXsem_t;
-+#else
- struct HXsem_t : public sem_t
- {
- char padding[64]; /* Flawfinder: ignore */ // different linux versions have different binary reps blechhhh!
- };
-+#endif
++/* #else
++ * struct HXsem_t : public sem_t
++ * {
++ * char padding[64]; // Flawfinder: ignore // different linux versions have different binary reps blechhhh!
++ * };
++ * #endif */
//=======================================================================
//
-diff -Naur helix-player-1.0.7.orig/datatype/ogg/fileformat/unix.pcf helix-player-1.0.7/datatype/ogg/fileformat/unix.pcf
---- helix-player-1.0.7.orig/datatype/ogg/fileformat/unix.pcf 2003-09-10 20:21:27.000000000 +0000
-+++ helix-player-1.0.7/datatype/ogg/fileformat/unix.pcf 2006-04-19 05:41:13.424221712 +0000
+diff -urNad helix-player-1.0.9~/datatype/ogg/fileformat/unix.pcf helix-player-1.0.9/datatype/ogg/fileformat/unix.pcf
+--- helix-player-1.0.9~/datatype/ogg/fileformat/unix.pcf 2003-09-11 06:21:27.000000000 +1000
++++ helix-player-1.0.9/datatype/ogg/fileformat/unix.pcf 2007-11-21 11:25:47.000000000 +1100
@@ -1,3 +1,4 @@
-project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libogg.a"))
@@ -125,9 +128,9 @@ diff -Naur helix-player-1.0.7.orig/datat
+#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 -Naur helix-player-1.0.7.orig/datatype/theora/renderer/linux2.pcf helix-player-1.0.7/datatype/theora/renderer/linux2.pcf
---- helix-player-1.0.7.orig/datatype/theora/renderer/linux2.pcf 2004-07-09 18:31:54.000000000 +0000
-+++ helix-player-1.0.7/datatype/theora/renderer/linux2.pcf 2006-04-19 05:39:54.554211776 +0000
+diff -urNad helix-player-1.0.9~/datatype/theora/renderer/linux2.pcf helix-player-1.0.9/datatype/theora/renderer/linux2.pcf
+--- helix-player-1.0.9~/datatype/theora/renderer/linux2.pcf 2004-07-10 04:31:54.000000000 +1000
++++ helix-player-1.0.9/datatype/theora/renderer/linux2.pcf 2007-11-21 11:25:47.000000000 +1100
@@ -53,7 +53,7 @@
oggLibPath = os.path.join(GetSDKPath("oggvorbissdk"), "lib")
@@ -140,9 +143,9 @@ diff -Naur helix-player-1.0.7.orig/datat
-project.AddSystemLibraries("pthread")
\ No newline at end of file
+project.AddSystemLibraries("pthread", "ogg", "theora")
-diff -Naur helix-player-1.0.7.orig/datatype/vorbis/renderer/unix.pcf helix-player-1.0.7/datatype/vorbis/renderer/unix.pcf
---- helix-player-1.0.7.orig/datatype/vorbis/renderer/unix.pcf 2003-09-10 20:20:58.000000000 +0000
-+++ helix-player-1.0.7/datatype/vorbis/renderer/unix.pcf 2006-04-19 05:41:05.539420384 +0000
+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 2003-09-11 06:20:58.000000000 +1000
++++ helix-player-1.0.9/datatype/vorbis/renderer/unix.pcf 2007-11-21 11:25:47.000000000 +1100
@@ -1,3 +1,4 @@
-project.AddLibraries(os.path.join(GetSDKPath("oggvorbissdk"), "lib", "libogg.a"))
diff -pruN 1.0.9-0ubuntu3/debian/rules 1.0.9-0ubuntu4/debian/rules
--- 1.0.9-0ubuntu3/debian/rules 2007-11-21 03:11:54.000000000 +0000
+++ 1.0.9-0ubuntu4/debian/rules 2007-11-21 03:11:52.000000000 +0000
@@ -133,7 +133,7 @@ install: build-stamp
install -D -m 0644 $$LINTIAN debian/`basename $$LINTIAN`/usr/share/lintian/overrides/`basename $$LINTIAN` || exit 1; \
done
# Remove zero sized po files.
- find $(CURDIR) -name '*.po' -size 0 -exec $(RM) \+
+ find $(CURDIR) -name '*.po' -size 0 -exec $(RM) {} \+
binary-indep: build-stamp install
More information about the helix-maintainers
mailing list