[cairo-commit] packaging/debian/cairo/debian .cvsignore, NONE, 1.1 changelog, 1.27, 1.28 compat, NONE, 1.1 control.in, NONE, 1.1 copyright, 1.10, 1.11 libcairo0.5.shlibs, 1.1, NONE libcairo0.6.0-dev.install, NONE, 1.1 libcairo0.6.0-doc.install, NONE, 1.1 libcairo0.6.0.install, NONE, 1.1 libcairo1-dev.install, 1.2, NONE libcairo1.install, 1.1, NONE libcairo1.shlibs, 1.4, NONE rules, 1.14, 1.15

[Dave Beckett]

Committed by: dajobe

Update of /cvs/cairo/packaging/debian/cairo/debian
In directory gabe:/tmp/cvs-serv22653

Modified Files:
	changelog copyright rules 
Added Files:
	.cvsignore compat control.in libcairo0.6.0-dev.install 
	libcairo0.6.0-doc.install libcairo0.6.0.install 
Removed Files:
	libcairo0.5.shlibs libcairo1-dev.install libcairo1.install 
	libcairo1.shlibs 
Log Message:
libcairo 0.6.0-1

--- NEW FILE: .cvsignore ---
*.debhelper
*.substvars
files
libcairo0.6.0
libcairo0.6.0-dev
libcairo0.6.0-doc
stamp-*
tmp

Index: changelog
===================================================================
RCS file: /cvs/cairo/packaging/debian/cairo/debian/changelog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- changelog	9 Jun 2005 20:56:14 -0000	1.27
+++ changelog	29 Jul 2005 22:39:29 -0000	1.28
@@ -1,3 +1,33 @@
+libcairo (0.6.0-1) unstable; urgency=low
+
+  * New upstream release
+  * libcairo0.6.0 replaces libcairo0.5.1
+  * Functions were added so create new sonames and libraries
+  * Require glitz 0.4.4 API and libpixman 0.1.5
+
+ -- Dave Beckett <dajobe at debian.org>  Fri, 29 Jul 2005 23:31:05 +0100
+
+libcairo (0.5.1-2) unstable; urgency=low
+
+  * Upload to unstable
+  * libcairo0.5.1 replaces older libcairo1
+  * libcairo0.5.1-dev already conflicted with libcairo1-dev so enable
+    shipping libcairo.so and delete patch 05-cairo.pc.in.patch as the
+    cairo.pc.in is ok again
+
+ -- Dave Beckett <dajobe at debian.org>  Sun, 10 Jul 2005 22:07:22 +0100
+
+libcairo (0.5.1-1) experimental; urgency=low
+
+  * New upstream release
+  * Revert to source package name libcairo
+  * Reflect ABI version into both library soname as libcairo-1debian0.5.1
+    and package name libcairo0.5.1 (Closes: #314776)
+  * libcairo0.5.1 no longer conflicts with libcairo1
+  * Added a libcairo0.5.1-doc package with the HTML documentation
+
+ -- Dave Beckett <dajobe at debian.org>  Wed, 22 Jun 2005 21:06:01 +0100
+
 cairo (0.5.0-2) unstable; urgency=low
 
   * Fix the shlibs dependencies for libcairo0.5
@@ -6,7 +36,7 @@
 
 cairo (0.5.0-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release (Closes: 311042)
   * Change source package s/lib// and add API version to binary packages
   * Enable glitz backend (Closes: 307573)
 

--- NEW FILE: compat ---
4

--- NEW FILE: control.in ---
Source: libcairo
Section: libs
Priority: optional
Maintainer: Dave Beckett <dajobe at debian.org>
Build-Depends: debhelper (>= 4.1.0), cdbs, autotools-dev, pkg-config, libpixman1-dev (>= 0.1.5), libfontconfig1-dev, libfreetype6-dev (>=2.1.0), libxrender-dev (>=0.6.0), libx11-dev, libpng12-dev, libglitz1-dev (>= 0.4.3+cvs20050728)
Standards-Version: 3.6.2

Package: libcairo at UPVERSION@-dev
Provides: libcairo-dev
Conflicts: libcairo-dev, libcairo1-dev (<< 0.5.0), libcairo0.5.1-dev
Suggests: libcairo at UPVERSION@-doc
Section: libdevel
Architecture: any
Depends: libcairo at UPVERSION@ (= ${Source-Version}), libpixman1-dev (>= 0.1.5), libfontconfig1-dev, libfreetype6-dev (>=2.1.0), libxrender-dev (>=0.6.0), libpng12-dev, libglitz1-dev (>= 0.4.3+cvs20050728)
Description: Development files for the Cairo 2D graphics library
 Cairo is a multi-platform library providing anti-aliased
 vector-based rendering for multiple target backends.
 .
 This package contains the development libraries, header files needed by
 programs that want to compile with Cairo.

Package: libcairo at UPVERSION@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
Replaces: libcairo1 (<< 0.5.0), libcairo0.5.1
Description: The Cairo 2D vector graphics library
 Cairo is a multi-platform library providing anti-aliased
 vector-based rendering for multiple target backends. Paths consist
 of line segments and cubic splines and can be rendered at any width
 with various join and cap styles. All colors may be specified with
 optional translucence (opacity/alpha) and combined using the
 extended Porter/Duff compositing algebra as found in the X Render
 Extension.
 .
 Cairo exports a stateful rendering API similar in spirit to the path
 construction, text, and painting operators of PostScript, (with the
 significant addition of translucence in the imaging model). When
 complete, the API is intended to support the complete imaging model of
 PDF 1.4.
 .
 This package contains the shared libraries.

Package: libcairo at UPVERSION@-doc
Section: libs
Architecture: all
Depends: lynx | www-browser
Conflicts: libcairo0.5.1-doc
Description: Documentation for the Cairo Multi-platform 2D graphics library
 Cairo is a multi-platform library providing anti-aliased
 vector-based rendering for multiple target backends.
 .
 This package contains the HTML documentation for the Cairo library
 in /usr/share/doc/libcairo at UPVERSION@-doc/ .


Index: copyright
===================================================================
RCS file: /cvs/cairo/packaging/debian/cairo/debian/copyright,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- copyright	24 Jun 2005 08:25:57 -0000	1.10
+++ copyright	29 Jul 2005 22:39:29 -0000	1.11
@@ -8,7 +8,7 @@
   Copyright 1999 Tom Tromey
   Copyright 2002, 2003 University of Southern California, Information
     Sciences Institute  (ISI)
-  Copyright 2002, 2004, 2005 Keith Packard
+  Copyright 2000, 2002, 2004, 2005 Keith Packard
   Copyright 2004 Calum Robinson
   Copyright 2004 Richard D. Worth
   Copyright 2004, 2005 Red Hat, Inc.

--- libcairo0.5.shlibs DELETED ---

--- NEW FILE: libcairo0.6.0-dev.install ---
debian/tmp/usr/include/cairo/*.h /usr/include/cairo
debian/tmp/usr/lib/libcairo.so /usr/lib
debian/tmp/usr/lib/libcairo*.a /usr/lib
debian/tmp/usr/lib/libcairo*.la /usr/lib
debian/tmp/usr/lib/pkgconfig/cairo.pc /usr/lib/pkgconfig

--- NEW FILE: libcairo0.6.0-doc.install ---
debian/tmp/usr/share/gtk-doc/html/cairo

--- NEW FILE: libcairo0.6.0.install ---
debian/tmp/usr/lib/libcairo-*.so /usr/lib

--- libcairo1-dev.install DELETED ---

--- libcairo1.install DELETED ---

--- libcairo1.shlibs DELETED ---

Index: rules
===================================================================
RCS file: /cvs/cairo/packaging/debian/cairo/debian/rules,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- rules	9 Jun 2005 19:46:40 -0000	1.14
+++ rules	29 Jul 2005 22:39:29 -0000	1.15
@@ -2,8 +2,18 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/makefile.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 # --disable-xcb just to be sure. Otherwise Build-Depend etc. on libxcb1-dev
 #
 # --enable-glitz just to be sure
 DEB_CONFIGURE_USER_FLAGS=--disable-xcb --enable-glitz
+
+# make sure it depends on >=current-version
+DEB_DH_MAKESHLIBS_ARGS_ALL=-V
+
+UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
+
+pre-build:: debian/control 
+
+debian/control:: debian/control.in
+	sed -e 's/@UPVERSION@/${UPVERSION}/g' $@.in > $@