Timo Juhani Lindfors <timo.lindf...@iki.fi> writes:
> I guess I'll just remove all entries from wimpiggy.install for now since
> I'm only interested in xpra.
Next failure :)
dh_installdocs
cp: cannot stat 'xpra.README': No such file or directory
Then
dh_installdocs
cp: cannot stat 'wimpiggy.README': No such file or directory
dh_installdocs: cp -a wimpiggy.README
debian/python-wimpiggy/usr/share/doc/python-wimpiggy returned exit code 1
... anyways, after six patches I managed to get xpra build and the bug
does not seem to occur anymore, great :)
I'm attaching the patches just in case it helps you with packaging the
next upstream release. They are not of very high quality so beware.
>From 038b4297adc985b2c342ea117d688fd53470ba85 Mon Sep 17 00:00:00 2001
From: Timo Juhani Lindfors <timo.lindf...@iki.fi>
Date: Wed, 5 Jun 2013 13:23:33 +0300
Subject: [PATCH 1/6] forward-port to work with svn 3586
---
debian/patches/old-libav.patch | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/debian/patches/old-libav.patch b/debian/patches/old-libav.patch
index 4b32cfb..753a5a9 100644
--- a/debian/patches/old-libav.patch
+++ b/debian/patches/old-libav.patch
@@ -2,32 +2,28 @@ Description: Build against old versions of libav.
Author: Antoine Martin <anto...@devloop.org.uk>
Forwarded: not-needed
---- a/xpra/x264/x264lib.c
-+++ b/xpra/x264/x264lib.c
-@@ -403,13 +403,14 @@
- if (avcodec_open2(ctx->codec_ctx, ctx->codec, NULL) < 0) {
+--- a/xpra/codecs/dec_avcodec/dec_avcodec.c
++++ b/xpra/codecs/dec_avcodec/dec_avcodec.c
+@@ -149,11 +149,12 @@ struct dec_avcodec_ctx *init_decoder(int width, int height, const char *colorspa
fprintf(stderr, "could not open codec\n");
- return 1;
+ goto err;
}
- ctx->frame = avcodec_alloc_frame();
+ ctx->frame = malloc(sizeof(struct AVFrame));
if (!ctx->frame) {
- fprintf(stderr, "could not allocate an AVFrame for decoding\n");
- return 1;
+ fprintf(stderr, "could not allocate an AVFrame for decoding\n");
+ goto err;
}
+ memset(ctx->frame, 0, sizeof(struct AVFrame));
- return 0;
- }
- struct x264lib_ctx *init_decoder(int width, int height, int use_swscale, int csc_fmt)
- {
-@@ -426,9 +427,9 @@
+ return ctx;
- void do_clean_decoder(struct x264lib_ctx *ctx)
+ err:
+@@ -164,7 +165,7 @@ err:
+ void clean_decoder(struct dec_avcodec_ctx *ctx)
{
if (ctx->frame) {
- avcodec_free_frame(&ctx->frame);
-+ free(ctx->frame);
++ free(&ctx->frame);
ctx->frame = NULL;
}
if (ctx->codec_ctx) {
- avcodec_close(ctx->codec_ctx);
--
1.7.10.4
>From 50be4455de13a6f0a4918cd268d4ea9a0334bfc8 Mon Sep 17 00:00:00 2001
From: Timo Juhani Lindfors <timo.lindf...@iki.fi>
Date: Wed, 5 Jun 2013 13:33:56 +0300
Subject: [PATCH 2/6] hack: wimpiggy appears to have moved somewhere
---
debian/python-wimpiggy.install | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/python-wimpiggy.install b/debian/python-wimpiggy.install
index abbc046..e69de29 100644
--- a/debian/python-wimpiggy.install
+++ b/debian/python-wimpiggy.install
@@ -1 +0,0 @@
-usr/lib/*/*/wimpiggy
--
1.7.10.4
>From a454e64728a38e30837d73629f753e71412d5d4b Mon Sep 17 00:00:00 2001
From: Timo Juhani Lindfors <timo.lindf...@iki.fi>
Date: Wed, 5 Jun 2013 13:42:16 +0300
Subject: [PATCH 3/6] hack: xpra documentation seems to have moved somewhere
---
debian/xpra.docs | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/xpra.docs b/debian/xpra.docs
index 8d0ed36..e69de29 100644
--- a/debian/xpra.docs
+++ b/debian/xpra.docs
@@ -1 +0,0 @@
-xpra.README
--
1.7.10.4
>From 8cb1053b1ecfc112341a7c2404d5371145736203 Mon Sep 17 00:00:00 2001
From: Timo Juhani Lindfors <timo.lindf...@iki.fi>
Date: Wed, 5 Jun 2013 13:45:44 +0300
Subject: [PATCH 4/6] hack: python-wimpiggy documentation seems to have moved
somewhere
---
debian/python-wimpiggy.docs | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/python-wimpiggy.docs b/debian/python-wimpiggy.docs
index 732e95f..e69de29 100644
--- a/debian/python-wimpiggy.docs
+++ b/debian/python-wimpiggy.docs
@@ -1 +0,0 @@
-wimpiggy.README
--
1.7.10.4
>From 463683e5a4a9cb3750705d22040b556b68643c42 Mon Sep 17 00:00:00 2001
From: Timo Juhani Lindfors <timo.lindf...@iki.fi>
Date: Wed, 5 Jun 2013 11:35:57 +0300
Subject: [PATCH 5/6] disable patch conf-audio-codecs.patch that is already
upstream
---
debian/patches/series | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/series b/debian/patches/series
index b3ce9dd..131a2f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,7 +11,7 @@
buildinfo-revision.patch
## Config customisations:
-conf-audio-codecs.patch
+#conf-audio-codecs.patch
conf-default-min-quality.patch
conf-default-speaker.patch
conf-default-xsession.patch
--
1.7.10.4
>From 1f2d7a98b044470a3d5c42c6654a9e3997e9eab5 Mon Sep 17 00:00:00 2001
From: Timo Juhani Lindfors <timo.lindf...@iki.fi>
Date: Wed, 5 Jun 2013 11:26:07 +0300
Subject: [PATCH 6/6] update changelog
---
debian/changelog | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index f2cbe70..0d11118 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xpra (0.9.4+svn3586-1) UNRELEASED; urgency=low
+
+ * SVN snapshot.
+
+ -- Timo Juhani Lindfors <timo.lindf...@iki.fi> Wed, 05 Jun 2013 11:21:37 +0300
+
xpra (0.9.4+dfsg-1) unstable; urgency=low
* New upstream release [May 2013].
--
1.7.10.4
