tag 630811 patch
thanks
Hi,
Cyril Brulebois k...@debian.org (17/06/2011):
Currently, the website (and testing) advises a git snapshot past 1.11.2,
but that tag would be sufficient to get things built. A few cherry-picks
would make more or less all clients run mostly OK, and I can prepare
either:
- a patch series with all the needed commits (touching the gl part only),
- or a big patch, squashing all commits into a single commit,
depending on what you prefer.
I went for one patch per commit for now, let me know if you prefere a
big patch.
I've pointed upstream-experimental to the 1.11.2 release, merged that
into master as debian-experimental, and worked from this point.
The resulting branches can be seen in that repository:
http://cgit.freedesktop.org/~kibi/cairo
I'm also attaching the git format-patch'es for the debian-experimental
branch (compressing the last one since it might be a bit too big for
debbugs or lists.d.o).
Please let me know if you find any mistakes. If that looks OK, I'd
be happy to see somebody from the team upload that for me.
Thanks already!
Mraw,
KiBi.
From 15e97cd920f5ab9223596314d50426ccd86472cf Mon Sep 17 00:00:00 2001
From: Cyril Brulebois k...@debian.org
Date: Mon, 20 Jun 2011 02:00:25 +0200
Subject: [PATCH 1/9] New upstream release.
---
debian/changelog |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6e998db..54ee17b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cairo (1.11.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois k...@debian.org Sun, 19 Jun 2011 22:42:20 +0200
+
cairo (1.10.2-6) unstable; urgency=low
* debian/patches/03_export-symbols.patch:
--
1.7.5.4
From 5c25c5f31c7f3c13191cc2cdc6708c4190a29224 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois k...@debian.org
Date: Mon, 20 Jun 2011 02:01:00 +0200
Subject: [PATCH 2/9] debian/control: pixman 0.20.2 is now required.
---
debian/changelog |3 +++
debian/control |4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 54ee17b..a067458 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
cairo (1.11.2-1) UNRELEASED; urgency=low
* New upstream release.
+ * debian/control:
++ Bump Build-Depends on libpixman-1-dev from 0.18.4 to 0.20.2.
++ Bump Depends on libpixman-1-dev in libcairo2-dev accordingly.
-- Cyril Brulebois k...@debian.org Sun, 19 Jun 2011 22:42:20 +0200
diff --git a/debian/control b/debian/control
index 750d2b7..00a87a5 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (= 7),
libsm-dev,
xutils-dev,
libxt-dev,
- libpixman-1-dev (= 0.18.4),
+ libpixman-1-dev (= 0.20.2),
libxcb1-dev (= 1.4),
libxcb-render0-dev (= 0.9.92),
libxcb-shm0-dev,
@@ -41,7 +41,7 @@ Depends: libcairo2 (= ${binary:Version}),
libxrender-dev (= 0.6),
libpng12-dev,
libsm-dev,
- libpixman-1-dev (= 0.18.4),
+ libpixman-1-dev (= 0.20.2),
libxcb1-dev (= 1.4),
libxcb-render0-dev (= 0.9.92),
libxcb-shm0-dev,
--
1.7.5.4
From ce2c8cb8bfcc7b5be6eca7d10a90ced002ac4b8e Mon Sep 17 00:00:00 2001
From: Cyril Brulebois k...@debian.org
Date: Mon, 20 Jun 2011 02:03:12 +0200
Subject: [PATCH 3/9] Add lintian override for embedded-library (glew).
---
debian/changelog |3 +++
debian/libcairo2.lintian-overrides |1 +
2 files changed, 4 insertions(+), 0 deletions(-)
create mode 100644 debian/libcairo2.lintian-overrides
diff --git a/debian/changelog b/debian/changelog
index a067458..ba6ed24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ cairo (1.11.2-1) UNRELEASED; urgency=low
* debian/control:
+ Bump Build-Depends on libpixman-1-dev from 0.18.4 to 0.20.2.
+ Bump Depends on libpixman-1-dev in libcairo2-dev accordingly.
+ * debian/libcairo2.lintian-overrides:
++ Add override for embedded-library; glew is going away post 1.11.2
+ anyway, so overriding temporarily is OK.
-- Cyril Brulebois k...@debian.org Sun, 19 Jun 2011 22:42:20 +0200
diff --git a/debian/libcairo2.lintian-overrides b/debian/libcairo2.lintian-overrides
new file mode 100644
index 000..e910684
--- /dev/null
+++ b/debian/libcairo2.lintian-overrides
@@ -0,0 +1 @@
+embedded-library usr/lib/libcairo.so.2.11000.2: glew
--
1.7.5.4
From 2bda821dea120830df8af2fd387f59614160b316 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois k...@debian.org
Date: Mon, 20 Jun 2011 02:05:43 +0200
Subject: [PATCH 4/9] rules: Call dh_lintian -i/-s accordingly.
---
debian/changelog |2 ++
debian/rules |2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ba6ed24..df333d3 100644
---
