[SCM] xvidcore packaging branch, master-ubuntu, updated. debian/1.2.2+debian-0ubuntu1-3-gf94741e

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master-ubuntu branch:
commit f94741e3789a85ce994bc57e1711a96f3adf6556
Author: Kees Cook <kees at ubuntu.com>
Date:   Tue Mar 2 11:20:39 2010 -0800

    Imported Debian patch 1.2.2+debian-0ubuntu2

diff --git a/debian/changelog b/debian/changelog
index 90325ae..0b7c375 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-xvidcore (2:1.2.2+debian-0ubuntu2) UNRELEASED; urgency=low
+xvidcore (2:1.2.2+debian-0ubuntu2) lucid; urgency=low
 
-  * debian/control:
-    - Make libxvidcore-dev replace libxvidcore4-dev.
+  * Non-exec patches got broken upstream by invoking yasm -f elf64/elf32,
+    so the __OUTPUT_FORMAT__==elf test no longer works.  Instead, trigger
+    the section in the global include file, thanks to Russell Coker
+    (LP: #530876).
 
- -- Maia Kozheva <sikon at ubuntu.com>  Sat, 21 Nov 2009 11:30:27 +0600
+ -- Kees Cook <kees at ubuntu.com>  Tue, 02 Mar 2010 11:20:39 -0800
 
 xvidcore (2:1.2.2+debian-0ubuntu1) lucid; urgency=low
 
diff --git a/debian/control b/debian/control
index 4cb569c..e4d499e 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,6 @@ Section: libdevel
 Architecture: any
 Depends: libxvidcore4 (= ${binary:Version}),
          ${misc:Depends}
-Replaces: libxvidcore4-dev
 Description: An open source MPEG-4 video codec (development)
  Xvid (formerly XviD) is an open source MPEG-4 video codec, implementing MPEG-4
  Simple Profile, Advanced Simple Profile, and Advanced Video Coding standards.
diff --git a/src/nasm.inc b/src/nasm.inc
index 180dbc5..edb4024 100644
--- a/src/nasm.inc
+++ b/src/nasm.inc
@@ -23,6 +23,8 @@
 ; *
 ; ***************************************************************************/
 
+section .note.GNU-stack noalloc noexec nowrite progbits
+
 %ifdef ARCH_IS_X86_64
 
 BITS 64

-- 
xvidcore packaging