Changeset 4444 for pkg

Timestamp:

11/07/08 19:39:40 (5 years ago)

Author:

alanbach-guest

Message:

• Sync'd with Debian 1.8.2-1

Location:

pkg/boss/main/cairo/trunk/debian

Files:

• changelog (modified) (2 diffs)
• control (modified) (6 diffs)
• libcairo-directfb2.symbols (added)
• libcairo2-doc.doc-base (modified) (1 diff)
• libcairo2.symbols (added)
• patches (added)
• patches/00list (added)
• patches/02_no-private-symbol-export.dpatch (added)
• rules (modified) (5 diffs)

pkg/boss/main/cairo/trunk/debian/changelog

@@ -1 @@
-cairo (1.6.4-parsix2) unstable; urgency=low
-
-  * Added libpixman-1-dev to deps
-
- -- Alan Baghumian <alan@technotux.org>  Mon, 21 Apr 2008 21:21:44 +0200
-
-cairo (1.6.4-parsix1) unstable; urgency=low
-
-  * New upstream stable release
-    - bump dh_makeshlib to 1.6.0
-    - add libpixman-1-dev to build-deps
-
- -- Alan Baghumian <alan@technotux.org>  Wed, 16 Apr 2008 13:38:57 +0200
-
-cairo (1.4.14-parsix2) unstable; urgency=low
-
-  * Sync'd with Debian, 1.4.14-1
-
- -- Alan Baghumian <alan@technotux.org>  Sun, 03 Feb 2008 11:04:16 +0330
-
-cairo (1.4.14-1) unstable; urgency=low
-
-  * New upstream release
-  * Removed patches merged upstream
-    - bug453718-git5e8f60531a09f357db38c4b646b1bbd29b97a891.dpatch
-    - cairobug12284-gitd62f8861689d8b9a9a837043fb78813f0407abd4.dpatch 
-    - cairobug9846-git21ab44f11d3d20eead5d988c7a6cf48eebff08c7.dpatch
-
- -- Dave Beckett <dajobe@debian.org>  Mon, 14 Jan 2008 18:28:38 -0800
+cairo (1.8.2-parsix1) unstable; urgency=low
+
+  * Sync'd with Debian 1.8.2-1
+
+ -- Alan Baghumian <alan@technotux.org>  Fri, 07 Nov 2008 10:35:14 -0800
+
+cairo (1.8.2-1) experimental; urgency=low
+
+  * New upstream stable release:
+    + debian/control:
+      - Update (Build-)Depends.
+      - Fix section of libcairo2 from docs to libs.
+    + debian/watch:
+      - Update location for releases.
+    + debian/rules:
+      - Patch from Ubuntu package to update config.guess/sub again properly.
+      - Update shlibs to 1.8.0 because of new API.
+      - Remove src/cairo-features.h as it's generated by configure and breaks
+        the build if it's already there.
+    + debian/libcairo-directfb2.symbols,
+      debian/libcairo2.symbols:
+      - Updated symbols.
+  * debian/patches/02_no-private-symbol-export.dpatch:
+    + Re-added to not export some private symbols.
+
+ -- Sebastian Dröge <slomo@debian.org>  Wed, 05 Nov 2008 12:17:09 +0100
+
+cairo (1.7.4-1) experimental; urgency=low
+
+  * New upstream snapshot release
+  * Removed debian/patches/02_no-private-symbol-export.dpatch merged upstream
+  * Removed debian/patches/01_directfb-no-accel.dpatch
+    Hoping that this GIT commit makes it moot:
+    + commit 7fbda72137d8685718a8e8fe1d3af5b1d377521c
+      Date: Sun Aug 10 05:05:27 2008 -0700
+  * Known packaging errors:
+    - not copying new config.sub/config.guess for now
+
+ -- Dave Beckett <dajobe@debian.org>  Thu, 11 Sep 2008 23:03:15 -0700
+
+cairo (1.6.4-7) unstable; urgency=low
+
+  * debian/rules:
+    + Remove libtool .la dependency_libs (Closes: #491292)
+  * debian/control:
+    + Update to standards version 3.8.0
+    + Move libcairo2-doc to 'doc' section (Closes: #486174)
+  * debian/dpatch/*: Added ##DP descriptions (lintian)
+  * debian/libcairo2.symbols: Removed symbols with a debian revision (lintian)
+  * debian/libcairo2-doc.doc-base: Use section "Graphics" (lintian)
+
+ -- Dave Beckett <dajobe@debian.org>  Sun, 07 Sep 2008 15:33:00 -0700
+
+cairo (1.6.4-6) unstable; urgency=low
+
+  * debian/control:
+    + Let libcairo2-dev depend on libxcb-render-util0-dev (Closes: #486006).
+
+ -- Sebastian Dröge <slomo@debian.org>  Fri, 13 Jun 2008 11:55:50 +0200
+
+cairo (1.6.4-5) unstable; urgency=low
+
+  * debian/rules,
+    debian/control,
+    debian/libcairo2.symbols:
+    + Enable XCB backend now that XCB is in unstable (Closes: #474353).
+
+ -- Sebastian Dröge <slomo@debian.org>  Tue, 10 Jun 2008 07:46:49 +0200
+
+cairo (1.6.4-4) unstable; urgency=low
+
+  * debian/rules:
+    + Make sure that the debug package contains debug symbols for the
+      libcairo2 package and not for the directfb one (Closes: #484603).
+
+ -- Sebastian Dröge <slomo@debian.org>  Thu, 05 Jun 2008 12:35:35 +0200
+
+cairo (1.6.4-3) unstable; urgency=low
+
+  * debian/patches/02_no-private-symbol-export.dpatch,
+    debian/libcairo2.symbols,
+    debian/libcairo-directfb2.symbols,
+    debian/rules:
+    + Don't export private symbols and pass -c4 to
+      dh_makeshlibs (Closes: #481260).
+  * debian/control:
+    + Fix documentation path in the package description (Closes: #464116).
+  * debian/rules:
+    + Only build the arch-indep packages when build-indep is
+      invoked (Closes: #476499).
+
+ -- Sebastian Dröge <slomo@debian.org>  Wed, 28 May 2008 11:19:21 +0200
+
+cairo (1.6.4-2) unstable; urgency=low
+
+  * debian/patches/01_directfb-no-accel.dpatch:
+    + Disable rendering acceleration for the DirectFB backend as it
+      causes broken screen repainting with the Debian installer 
+      and other GTK/DirectFB applications (Closes: #477331).
+
+ -- Sebastian Dröge <slomo@debian.org>  Tue, 13 May 2008 10:34:26 +0200
+
+cairo (1.6.4-1) unstable; urgency=low
+
+  * New upstream release:
+    + Works on remote Sun displays by adding support for
+      8 bit pseudocolors (Closes: #348109).
+    + Adds support for 32 bit visuals (Closes: #421266).
+    + Adds support for 655 xlib format (Closes: #413690).
+    + Fixes error when creating pdf charts (Closes: #474136).
+    + Fixes assertions in cairo_destroy (Closes: #423951).
+    + Fixes display errors with iceweasel 3.0 (Closes: #474395).
+    + debian/control:
+      - Update build dependencies and dependencies.
+      - Add myself as co-maintainer.
+      - Fix spelling error.
+    + debian/rules:
+      - Update shlibs to >= 1.6.0 because of API additions.
+    + debian/libcairo2.symbols,
+      debian/libcairo-directfb2.symbols:
+      - Add symbol files for the libraries.
+
+ -- Sebastian Dröge <slomo@debian.org>  Tue, 15 Apr 2008 20:07:29 +0200
+
+cairo (1.5.8-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Dave Beckett <dajobe@debian.org>  Wed, 30 Jan 2008 08:27:44 -0800
+
+cairo (1.5.6-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Dave Beckett <dajobe@debian.org>  Wed, 16 Jan 2008 19:14:02 -0800
+
+cairo (1.5.4-1) experimental; urgency=low
+
+  * Cairo snapshot packaging (Closes: #452736)
+    - NOTE: This is the *unstable* Cairo API and may change at any time before
+      the next stable release which will be called something like 1.6.0
+
+ -- Dave Beckett <dajobe@debian.org>  Mon, 24 Dec 2007 15:08:42 -0800
 
 cairo (1.4.12-2) unstable; urgency=low
@@ -43 +157 @@
     git commit 5e8f60531a09f357db38c4b646b1bbd29b97a891 (Closes: #453718)
 
- -- Dave Beckett <dajobe@debian.org>  Tue, 25 Dec 2007 11:32:10 -0800
-
-cairo (1.5.4-1) experimental; urgency=low
-
-  * Cairo snapshot packaging (Closes: #452736)
-    - NOTE: This is the *unstable* Cairo API and may change at any time before
-      the next stable release which will be called something like 1.6.0
-
- -- Dave Beckett <dajobe@debian.org>  Mon, 24 Dec 2007 15:08:42 -0800
+ -- Dave Beckett <dajobe@debian.org>  Sun, 16 Dec 2007 12:57:00 -0800
 
 cairo (1.4.12-1) unstable; urgency=low

pkg/boss/main/cairo/trunk/debian/control

@@ -3 +3 @@
 Priority: optional
 Maintainer: Dave Beckett <dajobe@debian.org>
-Build-Depends: debhelper (>= 5.0.22), autotools-dev, pkg-config (>= 0.19), libfontconfig1-dev, libfreetype6-dev (>=2.1.10), libxrender-dev (>=0.6.0), libx11-dev, libpng12-dev, libdirectfb-dev (>=0.9.25), libsm-dev, xutils-dev, libxt-dev, dpatch, libpixman-1-dev
-Standards-Version: 3.7.3
+Uploaders: Sebastian Dröge <slomo@debian.org>
+Build-Depends: debhelper (>= 5.0.22), dpkg-dev (>= 1.14.13), autotools-dev, pkg-config (>= 0.19), libfontconfig1-dev, libfreetype6-dev (>= 2.1.10), libxrender-dev (>= 0.6.0), libx11-dev, libpng12-dev, libdirectfb-dev (>= 0.9.25), libsm-dev, xutils-dev, libxt-dev, dpatch, libpixman-1-dev (>= 0.12.0), libxcb1-dev (>= 0.9.92), libxcb-render0-dev (>= 0.9.92), libxcb-render-util0-dev
+Standards-Version: 3.8.0
 Homepage: http://cairographics.org/
 
@@ -14 +15 @@
 Section: libdevel
 Architecture: any
-Depends: libcairo2 (= ${binary:Version}), libfontconfig1-dev, libfreetype6-dev (>=2.1.10), libxrender-dev (>=0.6.0), libpng12-dev, libsm-dev, libpixman-1-dev
+Depends: libcairo2 (= ${binary:Version}), libfontconfig1-dev, libfreetype6-dev (>= 2.1.10), libxrender-dev (>= 0.6.0), libpng12-dev, libsm-dev, libpixman-1-dev (>= 0.12.0), libxcb1-dev, libxcb-render0-dev, libxcb-render-util0-dev
 Description: Development files for the Cairo 2D graphics library
  Cairo is a multi-platform library providing anti-aliased
@@ -66 +67 @@
  .
  This package contains the HTML documentation for the Cairo library
- in /usr/share/doc/libcairo2-doc/ .
+ in /usr/share/gtk-doc/html/cairo/.
 
 Package: libcairo-directfb2-udeb
@@ -78 +79 @@
  .
  This is version of cairo with only the DirectFB backend, intended
- primarily for use in the graphical debian installer.
+ primarily for use in the graphical Debian installer.
 
 Package: libcairo-directfb2
@@ -99 +100 @@
 Conflicts: libcairo2-directfb-dev
 Replaces: libcairo2-directfb-dev
-Depends: libcairo-directfb2 (= ${binary:Version}), libfontconfig1-dev, libfreetype6-dev (>=2.1.10), libpng12-dev, libdirectfb-dev (>=0.9.25)
+Depends: libcairo-directfb2 (= ${binary:Version}), libfontconfig1-dev, libfreetype6-dev (>= 2.1.10), libpng12-dev, libdirectfb-dev (>= 0.9.25), libpixman-1-dev (>= 0.12.0)
 Description: Development files for Cairo graphics library DirectFB build
  Cairo is a multi-platform library providing anti-aliased
@@ -106 +107 @@
  This package contains the development libraries, header files needed by
  programs that want to compile with Cairo compiled only against the
- DirectFB backend. Intended primarly for use in the graphical debian
+ DirectFB backend. Intended primarly for use in the graphical Debian
  installer, other builds should be against libcairo2-dev

pkg/boss/main/cairo/trunk/debian/libcairo2-doc.doc-base

@@ -5 +5 @@
  vector-based rendering for multiple target backends.
  This document covers programming using the Cairo library.
-Section: graphics
+Section: Graphics
 
 Format: HTML

pkg/boss/main/cairo/trunk/debian/rules

@@ -3 +3 @@
 # Configure for cairo packages
 
-# Supported backends (as of Cairo 1.4.10):
+# Supported backends (as of Cairo 1.7.4):
 #  (internal) Image
 #  xlib       Xlib
@@ -22 +22 @@
 MAIN_CONFIGURE_FLAGS = \
 --enable-xlib --enable-pdf --enable-ps --enable-svg \
---disable-glitz --disable-xcb --disable-directfb \
+--disable-glitz --enable-xcb --disable-directfb \
 --enable-png
 
@@ -140 +140 @@
         rm -rf $(MAIN_BUILD_DIR) $(DIRECTFB_BUILD_DIR) $(MAIN_DIST_DIR) $(DIRECTFB_DIST_DIR)
         rm -f debian/cairo-directfb.pc
+        # Generated by configure and breaks the build if already existing
+        rm -f src/cairo-features.h
 
         -rm -f config.h config.cache config.status config.log
@@ -166 +168 @@
         sed -e 's/Name: cairo/Name: cairo-directfb/' -e 's/^\(Libs: .*\)$$/\1 -Wl,-rpath,$${libdir}/' $(DIRECTFB_DIST_DIR)/$(DIRECTFB_PREFIX)/lib/pkgconfig/cairo.pc > $(DIRECTFB_DIST_DIR)/usr/lib/pkgconfig/cairo-directfb.pc
 
-        sed -i 's:/usr/lib/lib\([^ ]*\).la:-l\1:g' $(MAIN_DIST_DIR)/usr/lib/*.la
-        sed -i 's:/usr/lib/lib\([^ ]*\).la:-l\1:g' $(DIRECTFB_DIST_DIR)/usr/lib/libcairo-directfb/lib/*.la
+        sed -i "s:/usr/lib/lib\([^ ]*\).la:-l\1:g;s/dependency_libs=.*/dependency_libs=''/" $(MAIN_DIST_DIR)/usr/lib/*.la
+        sed -i "s:/usr/lib/lib\([^ ]*\).la:-l\1:g;s/dependency_libs=.*/dependency_libs=''/" $(DIRECTFB_DIST_DIR)/usr/lib/libcairo-directfb/lib/*.la
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
+        dh_testdir
+        dh_testroot
+        dh_install -i
+        dh_installchangelogs -i ChangeLog
+        dh_installdocs -i -A NEWS README AUTHORS
+        dh_link -i
+        dh_compress -i
+        dh_fixperms -i
+        dh_installdeb -i
+        dh_gencontrol -i
+        dh_md5sums -i
+        dh_builddeb -i
 
 # Build architecture-dependent files here.
@@ -177 +190 @@
         dh_testdir
         dh_testroot
-
-        dh_install
-        dh_installdocs -A README NEWS AUTHORS
-        dh_installchangelogs ChangeLog
-        dh_installman
-        dh_installexamples
-        dh_link
-        dh_strip -a --dbg-package=libcairo2-dbg
+        dh_install -s
+        dh_installdocs -s -A README NEWS AUTHORS
+        dh_installchangelogs -s ChangeLog
+        dh_installman -s
+        dh_installexamples -s
+        dh_link -s
+        dh_strip -s --dbg-package=libcairo2-dbg -Nlibcairo-directfb2-udeb -Nlibcairo-directfb2
+        dh_strip -plibcairo-directfb2-udeb -plibcairo-directfb2
         rm -rf debian/libcairo2-dbg/usr/lib/debug/usr/lib/libcairo-directfb
-        dh_compress
-        dh_fixperms
-        dh_makeshlibs -plibcairo2 -V 'libcairo2 (>=1.6.0)'
-        dh_makeshlibs -plibcairo-directfb2 -V 'libcairo-directfb2 (>=1.6.0)' --add-udeb 'libcairo-directfb2-udeb'
-        dh_installdeb
-        dh_shlibdeps
-        dh_perl
-        dh_gencontrol
-        dh_md5sums
-        dh_builddeb
+        dh_compress -s
+        dh_fixperms -s
+        dh_makeshlibs -plibcairo2 -V 'libcairo2 (>= 1.8.0)' -- -c4
+        dh_makeshlibs -plibcairo-directfb2 -V 'libcairo-directfb2 (>= 1.8.0)' --add-udeb 'libcairo-directfb2-udeb' -- -edebian/libcairo-directfb2/usr/lib/libcairo-directfb/lib/libcairo.so.2.* -c4
+        dh_installdeb -s
+        dh_shlibdeps -s
+        dh_perl -s
+        dh_gencontrol -s
+        dh_md5sums -s
+        dh_builddeb -s
 
 binary: binary-indep binary-arch
 
 .PHONY: build clean binary-indep binary-arch binary install configure \
-        patch unpatch clean1
+        patch unpatch clean