Changeset 7009

Timestamp:

12/20/10 04:20:11 (2 years ago)

Author:

alanbach-guest

Message:

• Sync'd with Debian 1.10.0-1

Location:

pkg/raul/main/cairo/trunk/debian

Files:

• cairo-perf-utils.README.Debian (added)
• cairo-perf-utils.install (added)
• changelog (modified) (5 diffs)
• control (modified) (5 diffs)
• copyright (modified) (1 diff)
• libcairo-gobject2.install (added)
• libcairo-gobject2.symbols (added)
• libcairo-script-interpreter2.install (added)
• libcairo-script-interpreter2.symbols (added)
• libcairo2-dev.install (modified) (1 diff)
• libcairo2.symbols (modified) (8 diffs)
• ltmain_as-needed.patch (added)
• patches/01_build_perf_utils.patch (added)
• patches/01_no-private-symbol-export.patch (deleted)
• patches/02_am-maintainer-mode.patch (added)
• patches/series (modified) (1 diff)
• rules (modified) (5 diffs)
• source (added)
• source/format (added)

pkg/raul/main/cairo/trunk/debian/changelog

@@ -1 @@
-cairo (1.8.10-parsix2) unstable; urgency=low
-
-  * Sync'd with Debian 1.8.10-4
-
- -- Alan Baghumian <alan@technotux.org>  Fri, 02 Jul 2010 19:16:32 -0700
-
-cairo (1.8.10-4) unstable; urgency=low
+cairo (1.10.0-parsix1) unstable; urgency=low
+
+  * Sync'd with Debian 1.10.0-1
+
+ -- Alan Baghumian <alan@technotux.org>  Sun, 19 Dec 2010 19:17:50 -0800
+
+cairo (1.10.0-1) experimental; urgency=low
+
+  [ Alexandros Frantzis ]
+  * debian/control:
+    + Add libcairo-script-interpreter2 package.
+    + Add cairo-perf-utils package (Closes: #587771).
+  * debian/libcairo-script-interpreter2.install,
+    debian/cairo-perf-utils.install:
+    + Add installation file list for new binary packages.
+  * debian/libcairo-script-interpreter2.symbols:
+    + Add new symbols for libcairo-script-interpreter.so library.
+  * debian/libcairo2-dev.install:
+    + Install the libcairo-script-interpreter.so symbolic link.
+  * debian/rules:
+    + Enable building of cairo-perf-* utilities.
+    + Run dh_makeshlibs for the libcairo-script-interpreter2 package.
+  * debian/patches/01_build_perf_utils.patch,
+    debian/patches/99_autoreconf.patch:
+    + Build cairo-perf-* utils as part of the normal build process.
+
+  [ Sebastian Dröge ]
+  * New upstream stable release (Closes: #595897):
+    + debian/libcairo2.symbols,
+      debian/libcairo-script-interpreter2.symbols,
+      debian/rules:
+      - Update symbols and shlibs to the stable version.
+    + debian/control:
+      - Update pixman build dependency to >= 0.18.4.
+    + debian/patches/01_build_perf_utils.patch:
+      - Refreshed.
+    + debian/control,
+      debian/libcairo-gobject2.symbols,
+      debian/libcairo-gobject2.install:
+      - Add GObject library.
+    + debian/patches/02_am-maintainer-mode.patch:
+      - Add AM_MAINTAINER_MODE again to configure.ac to
+        prevent build problems.
+    + debian/control,
+      debian/rules:
+      - Use dh-autoreconf instead of an autoreconf patch. cairo's
+        build system doesn't like patches...
+
+ -- Sebastian Dröge <slomo@debian.org>  Tue, 07 Sep 2010 10:09:10 +0200
+
+cairo (1.9.14-1) experimental; urgency=low
+
+  * New upstream development release:
+    + debian/patches/01_no-private-symbol-export.patch:
+      - Dropped, shouldn't be necessary since ages.
+    + debian/libcairo2.symbols,
+      debian/rules:
+      - Update symbols and shlibs version.
+
+ -- Sebastian Dröge <slomo@debian.org>  Mon, 26 Jul 2010 15:07:28 +0200
+
+cairo (1.9.12-1) experimental; urgency=low
+
+  * New upstream development release:
+    + debian/rules:
+      - Drop --disable-shave, cairo uses automake 1.11
+        silent rules now.
+    + debian/patches/03_no-cxx.patch,
+      debian/patches/05_am-maintainer-mode.patch,
+      debian/patches/99_autoreconf.patch:
+      - Dropped, first patch merged upstream and the
+        other two are not necessary anymore.
+    + debian/libcairo2.symbols,
+      debian/rules:
+      - Update symbols and shlibs version for the new API.
+
+ -- Sebastian Dröge <slomo@debian.org>  Mon, 12 Jul 2010 15:05:20 +0200
+
+cairo (1.9.10-1) experimental; urgency=low
+
+  * New upstream development release:
+    + Use subpixel rendering settings for fonts (Closes: #555722).
+    + debian/patches/99_autoreconf.patch:
+      - Regenerated for the new version.
+    + debian/patches/01_no-private-symbol-export.patch,
+      debian/patches/03_no-cxx.patch,
+      debian/patches/05_am-maintainer-mode.patch,
+      debian/patches/99_ltmain_as-needed.patch:
+      - Refreshed.
+
+ -- Sebastian Dröge <slomo@debian.org>  Sat, 26 Jun 2010 16:13:32 +0200
+
+cairo (1.9.8-1) experimental; urgency=low
+
+  * New upstream development release:
+    + Fixes crash in evince when displaying a file (Closes: #578072).
+    + debian/control:
+      - Update pixman and xcb (build-) dependencies.
+    + debian/patches/02_xcb-without-dri2.patch,
+      debian/patches/04_bo-rectangular-edge-traversal-invalid-read.patch,
+      debian/patches/06_bo-rectangular-skipping.patch:
+      - Dropped, merged upstream.
+    + debian/patches/03_no-cxx.patch,
+      debian/patches/99_autoreconf.patch:
+      - Refreshed for the new version.
+    + debian/libcairo2.symbols,
+      debian/rules:
+      - Update symbols and shlibs version for the new API.
+  * debian/copyright:
+    + Fix typo (Closes: #573530).
+
+ -- Sebastian Dröge <slomo@debian.org>  Mon, 14 Jun 2010 10:04:57 +0200
+
+cairo (1.9.6-6) experimental; urgency=low
+
+  * debian/patches/04_bo-rectangular-edge-traversal-invalid-read.patch,
+    debian/patches/06_bo-rectangular-skipping.patch:
+    + Patch from upstream GIT to fix invalid read during edge traversal
+      and incorrect skipping of edges. Fixes crash in WebKit.
+  * debian/patches/05_am-maintainer-mode.patch,
+    debian/patches/99_autoreconf.patch:
+    + Add support for disabling automake maintainer mode, which causes
+      warnings messages and possible errors during build.
+
+ -- Sebastian Dröge <slomo@debian.org>  Mon, 22 Mar 2010 06:49:30 +0100
+
+cairo (1.9.6-5) experimental; urgency=low
 
   * debian/rules:
@@ -21 +141 @@
   * debian/rules:
     + Use dh_prep instead of dh_clean -k.
+  * debian/patches/03_no-cxx.patch:
+    + Patch by Julien Cristau to drop the unecessary dependency on
+      libstdc++ caused by an automake stupidity.
+  * debian/patches/99_autoreconf.patch:
+    + Regenerated automake/autoconf files for the above change.
   * debian/patches/99_ltmain_as-needed.patch,
     debian/rules:
     + Link with -Wl,-z,defs -Wl,-O1 -Wl,--as-needed.
 
- -- Sebastian Dröge <slomo@debian.org>  Tue, 13 Apr 2010 08:34:29 +0200
-
-cairo (1.8.10-3) unstable; urgency=low
+ -- Sebastian Dröge <slomo@debian.org>  Fri, 19 Mar 2010 14:28:17 +0100
+
+cairo (1.9.6-4) experimental; urgency=low
 
   [ Cyril Brulebois ]
@@ -46 +171 @@
 
   [ Sebastian Dröge ]
-  * Upload to unstable (Closes: #573394).
-
- -- Sebastian Dröge <slomo@debian.org>  Sun, 14 Mar 2010 19:31:51 +0100
-
-cairo (1.8.10-2) unstable; urgency=low
-
-  * debian/rules:
-    + Don't touch configure.in and friends.
+  * Upload to experimental (Closes: #573394).
+
+ -- Sebastian Dröge <slomo@debian.org>  Sun, 14 Mar 2010 20:07:04 +0100
+
+cairo (1.9.6-3) experimental; urgency=low
+
+  * debian/control:
+    + Depend on libxcb-shm0-dev as required by the pkg-config
+      file (Closes: #572119).
+    + Update dependency versions as requested by the pkg-config files.      
+
+ -- Sebastian Dröge <slomo@debian.org>  Mon, 01 Mar 2010 18:55:01 +0100
+
+cairo (1.9.6-2) experimental; urgency=low
+
   * debian/control:
     + Add Breaks for xulrunner and iceape until they're fixed
@@ -60 +192 @@
     + Fix sections (Closes: #486174, #515919).
 
- -- Sebastian Dröge <slomo@debian.org>  Thu, 25 Feb 2010 13:16:47 +0100
-
-cairo (1.8.10-1) unstable; urgency=low
-
-  * New upstream bugfix release.
+ -- Sebastian Dröge <slomo@debian.org>  Thu, 25 Feb 2010 13:24:15 +0100
+
+cairo (1.9.6-1) experimental; urgency=low
+
+  * New upstream development release:
+    + debian/control:
+      - Update build dependencies.
+    + debian/libcairo2.symbols,
+      debian/rules:
+      - Update symbols and shlibs version for the new API.
   * debian/patches,
     debian/source/format,
@@ -76 +213 @@
     + Don't update config.guess/config.sub, upstream doesn't use them.
     + Don't delete cairo-features.h in clean.
-
- -- Sebastian Dröge <slomo@debian.org>  Tue, 23 Feb 2010 10:53:10 +0100
+    + Don't touch configure.in and friends.
+  * debian/patches/02_xcb-without-dri2.patch:
+    + Fix compilation without DRI2.
+
+ -- Sebastian Dröge <slomo@debian.org>  Tue, 23 Feb 2010 14:33:09 +0100
+
+cairo (1.9.4-1) experimental; urgency=low
+
+  * New upstream development release.
+    + debian/control:
+      - Update build dependencies.
+    + debian/libcairo2.symbols,
+      debian/rules:
+      - Update symbols and shlibs version for the new API.
+
+ -- Sebastian Dröge <slomo@debian.org>  Fri, 16 Oct 2009 08:46:43 +0200
+
+cairo (1.9.2-1) experimental; urgency=low
+
+  * New upstream development release.
+    + debian/control:
+      - Update build dependencies.
+    + debian/libcairo2.symbols,
+      debian/rules:
+      - Update symbols and shlibs version for the new API.
+  * debian/control:
+    + Update Standards-Version to 3.8.3.
+
+ -- Sebastian Dröge <slomo@debian.org>  Tue, 15 Sep 2009 17:23:45 +0200
 
 cairo (1.8.8-2) unstable; urgency=low

pkg/raul/main/cairo/trunk/debian/control

@@ -6 +6 @@
 Build-Depends: debhelper (>= 7),
                dpkg-dev (>= 1.14.13),
+               dh-autoreconf,
                pkg-config (>= 0.19),
-               libfontconfig1-dev,
+               libfontconfig1-dev (>= 2.2.95),
                libfreetype6-dev (>= 2.1.10),
                libxrender-dev (>= 1:0.9.5-2),
@@ -15 +16 @@
                xutils-dev,
                libxt-dev,
-               libpixman-1-dev (>= 0.12.0),
-               libxcb1-dev (>= 0.9.92),
+               libpixman-1-dev (>= 0.18.4),
+               libxcb1-dev (>= 1.4),
                libxcb-render0-dev (>= 0.9.92),
-               libxcb-render-util0-dev
+               libxcb-shm0-dev,
+               libglib2.0-dev,
+               zlib1g-dev
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/collab-maint/cairo.git
@@ -25 +28 @@
 
 Package: libcairo2-dev
-Provides: libcairo-dev
-Suggests: libcairo2-doc
 Section: libdevel
 Architecture: any
 Depends: libcairo2 (= ${binary:Version}),
-         libfontconfig1-dev,
+         libcairo-gobject2 (= ${binary:Version}),
+         libfontconfig1-dev (>= 2.2.95),
          libfreetype6-dev (>= 2.1.10),
-         libxrender-dev (>= 0.6.0),
+         libx11-dev,
+         libxrender-dev (>= 0.6),
          libpng12-dev,
          libsm-dev,
-         libpixman-1-dev (>= 0.12.0),
-         libxcb1-dev,
-         libxcb-render0-dev,
-         libxcb-render-util0-dev,
+         libpixman-1-dev (>= 0.18.4),
+         libxcb1-dev (>= 1.4),
+         libxcb-render0-dev (>= 0.9.92),
+         libxcb-shm0-dev,
+         libglib2.0-dev,
          ${shlibs:Depends},
          ${misc:Depends}
+Provides: libcairo-dev
+Suggests: libcairo2-doc,
+          libcairo-script-interpreter2 (= ${binary:Version})
 Description: Development files for the Cairo 2D graphics library
  Cairo is a multi-platform library providing anti-aliased
@@ -80 +87 @@
 Depends: libcairo2 (= ${binary:Version}),
          ${misc:Depends}
+Suggests: libcairo-gobject2 (= ${binary:Version}),
+          libcairo-script-interpreter2 (= ${binary:Version}),
+          cairo-perf-utils (= ${binary:Version})
 Description: The Cairo 2D vector graphics library (debugging symbols)
  Debugging symbols for the Cairo 2D vector graphics library. This is
@@ -96 +106 @@
  in /usr/share/gtk-doc/html/cairo/.
 
+Package: libcairo-script-interpreter2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: The Cairo 2D vector graphics library (script interpreter)
+ Cairo is a multi-platform library providing anti-aliased
+ vector-based rendering for multiple target backends.
+ .
+ This package contains the script interpreter for executing and manipulating
+ cairo execution traces.
+
+Package: libcairo-gobject2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: The Cairo 2D vector graphics library (GObject library)
+ Cairo is a multi-platform library providing anti-aliased
+ vector-based rendering for multiple target backends.
+ .
+ This package contains the GObject library, providing wrapper GObject types
+ for all cairo types.
+
+Package: cairo-perf-utils
+Section: misc
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: The Cairo 2D vector graphics library performance utilities
+ Cairo is a multi-platform library providing anti-aliased
+ vector-based rendering for multiple target backends.
+ .
+ This package contains a set of utilities for capturing and replaying cairo
+ execution traces using various backends, in order to be able to measure the
+ performance of cairo for real-world applications in a reproducible way.
+
 Package: libcairo2-udeb
 XC-Package-Type: udeb

pkg/raul/main/cairo/trunk/debian/copyright

@@ -42 +42 @@
 Every source file in the implementation of cairo is available to be
 redistributed and/or modified under the terms of either the GNU Lesser
-General Public License (LPGL) version 2.1 or the Mozilla Public
+General Public License (LGPL) version 2.1 or the Mozilla Public
 License (MPL) version 1.1.  Some files are available under more
 liberal terms, but we believe that in all cases, each file may be used

pkg/raul/main/cairo/trunk/debian/libcairo2-dev.install

@@ -1 +1 @@
 debian/install/main/usr/include/cairo/*.h /usr/include/cairo
-debian/install/main/usr/lib/libcairo.so /usr/lib
+debian/install/main/usr/lib/libcairo*.so /usr/lib
 debian/install/main/usr/lib/libcairo*.a /usr/lib
 debian/install/main/usr/lib/libcairo*.la /usr/lib

pkg/raul/main/cairo/trunk/debian/libcairo2.symbols

@@ -16 +16 @@
  cairo_debug_reset_static_data@Base 1.2.4
  cairo_destroy@Base 1.2.4
+ cairo_device_acquire@Base 1.10.0
+ cairo_device_destroy@Base 1.10.0
+ cairo_device_finish@Base 1.10.0
+ cairo_device_flush@Base 1.10.0
+ cairo_device_get_reference_count@Base 1.10.0
+ cairo_device_get_type@Base 1.10.0
+ cairo_device_get_user_data@Base 1.10.0
+ cairo_device_reference@Base 1.10.0
+ cairo_device_release@Base 1.10.0
+ cairo_device_set_user_data@Base 1.10.0
+ cairo_device_status@Base 1.10.0
  cairo_device_to_user@Base 1.2.4
  cairo_device_to_user_distance@Base 1.2.4
@@ -86 +97 @@
  cairo_image_surface_get_stride@Base 1.2.4
  cairo_image_surface_get_width@Base 1.2.4
+ cairo_in_clip@Base 1.10.0
  cairo_in_fill@Base 1.2.4
  cairo_in_stroke@Base 1.2.4
@@ -136 +148 @@
  cairo_pattern_set_user_data@Base 1.4.10
  cairo_pattern_status@Base 1.2.4
+ cairo_pdf_get_versions@Base 1.10.0
  cairo_pdf_surface_create@Base 1.2.4
  cairo_pdf_surface_create_for_stream@Base 1.2.4
+ cairo_pdf_surface_restrict_to_version@Base 1.10.0
  cairo_pdf_surface_set_size@Base 1.2.4
+ cairo_pdf_version_to_string@Base 1.10.0
  cairo_pop_group@Base 1.2.4
  cairo_pop_group_to_source@Base 1.2.4
@@ -154 +169 @@
  cairo_push_group@Base 1.2.4
  cairo_push_group_with_content@Base 1.2.4
+ cairo_recording_surface_create@Base 1.10.0
+ cairo_recording_surface_ink_extents@Base 1.10.0
  cairo_rectangle@Base 1.2.4
  cairo_rectangle_list_destroy@Base 1.4.10
  cairo_reference@Base 1.2.4
+ cairo_region_contains_point@Base 1.10.0
+ cairo_region_contains_rectangle@Base 1.10.0
+ cairo_region_copy@Base 1.10.0
+ cairo_region_create@Base 1.10.0
+ cairo_region_create_rectangle@Base 1.10.0
+ cairo_region_create_rectangles@Base 1.10.0
+ cairo_region_destroy@Base 1.10.0
+ cairo_region_equal@Base 1.10.0
+ cairo_region_get_extents@Base 1.10.0
+ cairo_region_get_rectangle@Base 1.10.0
+ cairo_region_intersect@Base 1.10.0
+ cairo_region_intersect_rectangle@Base 1.10.0
+ cairo_region_is_empty@Base 1.10.0
+ cairo_region_num_rectangles@Base 1.10.0
+ cairo_region_reference@Base 1.10.0
+ cairo_region_status@Base 1.10.0
+ cairo_region_subtract@Base 1.10.0
+ cairo_region_subtract_rectangle@Base 1.10.0
+ cairo_region_translate@Base 1.10.0
+ cairo_region_union@Base 1.10.0
+ cairo_region_union_rectangle@Base 1.10.0
+ cairo_region_xor@Base 1.10.0
+ cairo_region_xor_rectangle@Base 1.10.0
  cairo_rel_curve_to@Base 1.2.4
  cairo_rel_line_to@Base 1.2.4
@@ -213 +253 @@
  cairo_stroke_preserve@Base 1.2.4
  cairo_surface_copy_page@Base 1.6.0
+ cairo_surface_create_for_rectangle@Base 1.10.0
  cairo_surface_create_similar@Base 1.2.4
  cairo_surface_destroy@Base 1.2.4
@@ -218 +259 @@
  cairo_surface_flush@Base 1.2.4
  cairo_surface_get_content@Base 1.2.4
+ cairo_surface_get_device@Base 1.10.0
  cairo_surface_get_device_offset@Base 1.2.4
  cairo_surface_get_fallback_resolution@Base 1.7.2
  cairo_surface_get_font_options@Base 1.2.4
+ cairo_surface_get_mime_data@Base 1.10.0
  cairo_surface_get_reference_count@Base 1.4.10
  cairo_surface_get_type@Base 1.2.4
@@ -230 +273 @@
  cairo_surface_set_device_offset@Base 1.2.4
  cairo_surface_set_fallback_resolution@Base 1.2.4
+ cairo_surface_set_mime_data@Base 1.10.0
  cairo_surface_set_user_data@Base 1.2.4
  cairo_surface_show_page@Base 1.6.0
@@ -263 +307 @@
  cairo_version@Base 1.2.4
  cairo_version_string@Base 1.2.4
+ cairo_xcb_device_debug_cap_xrender_version@Base 1.10.0
+ cairo_xcb_device_debug_cap_xshm_version@Base 1.10.0
  cairo_xcb_surface_create@Base 1.6.4-5~
  cairo_xcb_surface_create_for_bitmap@Base 1.6.4-5~

pkg/raul/main/cairo/trunk/debian/patches/series

@@ -1 @@
-01_no-private-symbol-export.patch
-99_ltmain_as-needed.patch
+01_build_perf_utils.patch
+02_am-maintainer-mode.patch

pkg/raul/main/cairo/trunk/debian/rules

@@ -43 +43 @@
 --enable-xlib \
 --enable-png \
---disable-silent-rules --disable-shave \
+--disable-silent-rules \
+--disable-maintainer-mode \
 --build=$(DEB_BUILD_GNU_TYPE)
 
@@ -53 +54 @@
 $(configure_flags) \
 --enable-xlib --enable-svg \
---enable-xcb
+--enable-xcb --enable-perf-utils
 
 udeb_configure_flags += \
@@ -84 +85 @@
         -test -r src/cairo-features.h && \
           mv src/cairo-features.h src/cairo-features.h.orig
+        dh_autoreconf
+        patch -Np1 < debian/ltmain_as-needed.patch
         touch $@
 
@@ -106 +109 @@
         dh_testdir
         dh_testroot
-        # restore files from backup
         [ ! -r src/cairo-features.h.orig ] || mv -f src/cairo-features.h.orig src/cairo-features.h
+        [ ! -r configure-common-stamp ] || patch -NRp1 < debian/ltmain_as-needed.patch
         rm -f *-stamp
         rm -rf $(buildbasedir) $(installbasedir)
+        dh_autoreconf_clean
         dh_clean
 
@@ -152 +156 @@
         dh_compress -s
         dh_fixperms -s
-        dh_makeshlibs -plibcairo2 --add-udeb=libcairo2-udeb -V 'libcairo2 (>= 1.8.0-2)' -- -c4
+        dh_makeshlibs -plibcairo2 --add-udeb=libcairo2-udeb -V 'libcairo2 (>= 1.10.0)' -- -c4
+        dh_makeshlibs -plibcairo-gobject2 -V 'libcairo-gobject2 (>= 1.10.0)' -- -c4
+        dh_makeshlibs -plibcairo-script-interpreter2 -V 'libcairo-script-interpreter2 (>= 1.10.0)' -- -c4
         dh_installdeb -s
         dh_shlibdeps -s