Re: RFS: xpra/0.3.11+dfsg-1~bpo60+1

[Dmitry Smirnov <onlyjob@member.fsf.org>]

Hi David, 

Thanks for your time and apologies for neglecting changelog.

Updated source package is available from

http://mentors.debian.net/debian/pool/main/x/xpra/xpra_0.3.11+dfsg-1~bpo60+1.dsc

See full diff against version in "testing" attached.

I hope it is better now.

Cheers,
Dmitry.

diff --git a/debian/changelog b/debian/changelog
index 2100220..4705121 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xpra (0.3.11+dfsg-1~bpo60+1) squeeze-backports; urgency=low
+
+  * Releasing to squeeze-backports.
+  * Disabled "vpx" and "x264" codecs with corresponding patches to avoid
+    FTBFS in backports;
+    Disabled respective (unused) Build-Depends "libvpx-dev", "libx264-dev".
+  * Export LDFLAGS instead of relying on DEB_LDFLAGS_MAINT_APPEND which
+    doesn't work in backports.
+
+ -- Dmitry Smirnov <onlyjob@member.fsf.org>  Fri, 07 Dec 2012 14:06:34 +1100
+
 xpra (0.3.11+dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 2e0fb2f..8fb96e1 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,9 @@ Build-Depends: cython (>> 0.14.0),
                debhelper (>= 9),
                libavcodec-dev,
                libswscale-dev,
-               libvpx-dev,
+#               libvpx-dev,
                libx11-dev,
-               libx264-dev,
+#               libx264-dev,
                libxcomposite-dev,
                libxdamage-dev,
                libxtst-dev,
diff --git a/debian/patches/disable-vpx.patch b/debian/patches/disable-vpx.patch
new file mode 100644
index 0000000..adcb1e3
--- /dev/null
+++ b/debian/patches/disable-vpx.patch
@@ -0,0 +1,16 @@
+Last-Update: 2012-09-28
+Author: Antoine Martin <antoine@nagafix.co.uk>
+Forwarded: not-needed
+Description: Disable vpx encoding support.
+
+--- a/setup.py
++++ b/setup.py
+@@ -232,7 +232,7 @@
+ 
+ 
+ 
+-vpx_ENABLED = True
++vpx_ENABLED = False
+ filtered_args = []
+ for arg in sys.argv:
+     if arg == "--without-x264":
diff --git a/debian/patches/disable-x264.patch b/debian/patches/disable-x264.patch
new file mode 100644
index 0000000..cdc0fac
--- /dev/null
+++ b/debian/patches/disable-x264.patch
@@ -0,0 +1,16 @@
+Last-Update: 2012-09-28
+Author: Antoine Martin <antoine@nagafix.co.uk>
+Forwarded: not-needed
+Description: Disable x264 encoding support.
+
+--- a/setup.py
++++ b/setup.py
+@@ -228,7 +228,7 @@
+                 ["xpra/wait_for_x_server.pyx"],
+                 **pkgconfig("x11")
+                 ))
+-x264_ENABLED = True
++x264_ENABLED = False
+ 
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 17798c7..047e92b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+disable-vpx.patch
+disable-x264.patch
 r1854-fix-crash.patch
diff --git a/debian/rules b/debian/rules
index 40b8f89..3ce61ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
+export LDFLAGS=-Wl,--as-needed $(shell dpkg-buildflags --get LDFLAGS)
 %:
 	dh $@ --with python2

Attachment: signature.asc
Description: This is a digitally signed message part.