[cairo-commit] packaging/debian/pycairo/debian changelog, 1.4,
1.5 control, 1.4, 1.5 copyright, 1.1, 1.2 rules, 1.3,
1.4 watch, NONE, 1.1
Dave Beckett
commit at pdx.freedesktop.org
Mon Aug 1 14:28:54 PDT 2005
Committed by: dajobe
Update of /cvs/cairo/packaging/debian/pycairo/debian
In directory gabe:/tmp/cvs-serv30077
Modified Files:
changelog control copyright rules
Added Files:
watch
Log Message:
pycairo 0.6.0-1
Index: changelog
===================================================================
RCS file: /cvs/cairo/packaging/debian/pycairo/debian/changelog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- changelog 9 Jun 2005 21:43:00 -0000 1.4
+++ changelog 1 Aug 2005 21:28:52 -0000 1.5
@@ -1,3 +1,16 @@
+pycairo (0.6.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Require cairo 0.6
+ * Remove SVG support for now - remove libsvg-cairo dependency
+ * python2.3-cairo and python2.4-cairo conflict with each other
+ for the new pycairo.pc and includes.
+ * Added python-cairo-dev for the development headers for python2.3-cairo.
+ * Added python-cairo package for the default version of python (2.3)
+ * Undo patching
+
+ -- Dave Beckett <dajobe at debian.org> Mon, 1 Aug 2005 21:43:14 +0100
+
pycairo (0.5.0-1) unstable; urgency=low
* New upstream release
Index: control
===================================================================
RCS file: /cvs/cairo/packaging/debian/pycairo/debian/control,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- control 9 Jun 2005 21:43:13 -0000 1.4
+++ control 1 Aug 2005 21:28:52 -0000 1.5
@@ -2,22 +2,39 @@
Section: python
Priority: optional
Maintainer: Dave Beckett <dajobe at debian.org>
-Build-Depends: debhelper (>> 4.1.0), autotools-dev, pkg-config, python2.3-dev, python2.3-numeric, python2.4-dev, python2.4-numeric, libcairo0.5-dev (>= 0.5.0), libsvg-cairo1-dev (>= 0.1.5-4), libgtk2.0-dev (>= 2.0.0), python-gtk2-dev (>= 1.99.16)
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>> 4.1.0), autotools-dev, pkg-config, python2.3-dev, python2.3-numeric, python2.4-dev, python2.4-numeric, libcairo0.6.0-dev, libgtk2.0-dev (>= 2.0.0), python-gtk2-dev (>= 1.99.16)
+Standards-Version: 3.6.2
+
+Package: python-cairo
+Architecture: all
+Depends: python2.3-cairo (= ${Source-Version})
+Description: Python bindings for the Cairo vector graphics library
+ This package contains modules that allow you to use the cairo vector
+ graphics library in Python programs.
+ .
+ This package is a dependency package, which select the right package
+ for the default Python version (currently v2.3).
+
+Package: python-cairo-dev
+Architecture: all
+Depends: ${python:Depends}, python-cairo (= ${Source-Version})
+Description: Python cairo bindings: development files
+ This package contains files that allow you to compile wrappers
+ that interoperate with python-cairo (pycairo).
Package: python2.3-cairo
Architecture: any
Section: python
-Depends: ${shlibs:Depends}, python2.3
-Description: python 2.3 language bindings for the Cairo vector graphics library
- This package contains the files needed to use the Cairo vectory graphics
+Depends: ${shlibs:Depends}, ${python:Depends}
+Description: Python 2.3 language bindings for the Cairo vector graphics library
+ This package contains modules that allow you to use the Cairo vector graphics
library in Python 2.3 programs.
Package: python2.4-cairo
Architecture: any
Section: python
Depends: ${shlibs:Depends}, python2.4
-Description: python 2.4 language bindings for the Cairo vector graphics library
- This package contains the files needed to use the Cairo vectory graphics
+Description: Python 2.4 language bindings for the Cairo vector graphics library
+ This package contains modules that allow you to use the Cairo vector graphics
library in Python 2.4 programs.
Index: copyright
===================================================================
RCS file: /cvs/cairo/packaging/debian/pycairo/debian/copyright,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- copyright 4 Apr 2005 20:13:09 -0000 1.1
+++ copyright 1 Aug 2005 21:28:52 -0000 1.2
@@ -1,31 +1,18 @@
-This is the Debian package of the PyCairo python bindings for the
-Cairo vector graphics library
+This is the Debian package of PyCairo providing python bindings for
+the Cairo vector graphics library.
-Packaged by Dave Beckett <dave.beckett at bristol.ac.uk> 2005-02-02
+Packaged by Dave Beckett <dajobe at debian.org> from 2005-02-02
It was built from a snapshot sources from http://cairographics.org/snapshots/
-Copyright
--------
-PyCairo is free software.
-
-Every source file in the implementation of PyCairo is available to be
-redistributed and/or modified under the terms of either the GNU Lesser
-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
-under either the LGPL or the MPL.
-
-Please see each file in the implementation for Copyright and licensing
-information.
----------------------------
-cairo/*.c have the following Copyrights:
+Copyrights are as follows:
+cairo/*.c:
PyCairo - Python bindings for Cairo
- Copyright © 2003-2004 James Henstridge
- Copyright © 2003-2004 Steve Chaplin
+ Copyright © 2003-2005 James Henstridge
+ Copyright © 2003-2005 Steve Chaplin
This library is free software; you can redistribute it and/or
modify it either under the terms of the GNU Lesser General Public
@@ -50,6 +37,11 @@
OF ANY KIND, either express or implied. See the LGPL or the MPL for
the specific language governing rights and limitations.
+On Debian systems, the complete text of the GNU Lesser General Public
+License V2.1 can be found in /usr/share/common-licenses/LGPL-2.1 file.
+
+The contents of COPYING-MPL-1.1 are included below
+
examples/gtk/hangman.py:
@@ -76,12 +68,6 @@
Author: Kevin Worth <kevin at theworths.org>
---------
-
-On Debian systems, the complete text of the GNU Lesser General Public
-License V2.1 can be found in /usr/share/common-licenses/LGPL-2.1 file.
-
-The contents of COPYING-MPL-1.1 are included below
_________________________________________________________________
MOZILLA PUBLIC LICENSE
Index: rules
===================================================================
RCS file: /cvs/cairo/packaging/debian/pycairo/debian/rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rules 9 Jun 2005 21:43:19 -0000 1.3
+++ rules 1 Aug 2005 21:28:52 -0000 1.4
@@ -33,8 +33,9 @@
version := $(shell dpkg-parsechangelog | \
sed -ne 's/^Version: *\([0-9]\+:\)*//p')
-PYTHON=python2.3
-export PYTHON
+# Files from this python become content of python-cairo-dev
+PYTHON1=python2.3
+export PYTHON1
PYTHON2=python2.4
export PYTHON2
@@ -92,55 +93,69 @@
dh_clean -k
dh_installdirs
- PYTHON=$(PYTHON); \
+ PYTHON=`which $(PYTHON1)` \
./configure $(CONFFLAGS) \
--prefix=$(prefix) \
--mandir=$(share)/man \
--infodir=$(share)/info
- PYTHON=$(PYTHON); \
- PYTHON=$$PYTHON make install DESTDIR=$(CURDIR)/debian/tmp; \
- find $(CURDIR)/debian/tmp/usr/lib \( -name "*.py[co]" -o -name "*.la" \) -exec rm -f {} \;
+ PYTHON=`which $(PYTHON1)`; \
+ PYTHON=$$PYTHON make install DESTDIR=$(CURDIR)/debian/$(PYTHON1)-cairo pythondir=/usr/lib/$(PYTHON1)/site-packages PYTHON_INCLUDES=-I/usr/include/$(PYTHON1); \
+ find $(CURDIR)/debian/$(PYTHON1)-cairo/usr/lib \( -name "*.py[co]" -o -name "*.la" \) -exec rm -f {} \; ; \
+ mkdir -p $(CURDIR)/debian/python-cairo-dev/usr/lib
+ mv $(CURDIR)/debian/$(PYTHON1)-cairo/usr/include $(CURDIR)/debian/python-cairo-dev/usr/include
+ mv $(CURDIR)/debian/$(PYTHON1)-cairo/usr/lib/pkgconfig $(CURDIR)/debian/python-cairo-dev/usr/lib/pkgconfig
$(MAKE) clean
- PYTHON=$(PYTHON2); \
+ PYTHON=`which $(PYTHON2)` \
./configure $(CONFFLAGS) \
--prefix=$(prefix) \
--mandir=$(share)/man \
--infodir=$(share)/info
- PYTHON=$(PYTHON2); \
- PYTHON=$$PYTHON make install DESTDIR=$(CURDIR)/debian/$$PYTHON-cairo pythondir=/usr/lib/$$PYTHON/site-packages PYTHON_INCLUDES=-I/usr/include/$$PYTHON; \
- find $(CURDIR)/debian/$$PYTHON-cairo/usr/lib \( -name "*.py[co]" -o -name "*.la" \) -exec rm -f {} \;
+ PYTHON=`which $(PYTHON2)`; \
+ PYTHON=$$PYTHON make install DESTDIR=$(CURDIR)/debian/$(PYTHON2)-cairo pythondir=/usr/lib/$(PYTHON2)/site-packages PYTHON_INCLUDES=-I/usr/include/$(PYTHON2); \
+ find $(CURDIR)/debian/$(PYTHON2)-cairo/usr/lib \( -name "*.py[co]" -o -name "*.la" \) -exec rm -f {} \; ; \
+ rm -rf $(CURDIR)/debian/$(PYTHON2)-cairo/usr/include $(CURDIR)/debian/$(PYTHON2)-cairo/usr/lib/pkgconfig
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+# Build architecture-independent files here. (just python-cairo-dev)
+# Pass -i to all debhelper commands in this target to reduce clutter.
+binary-indep:
+ dh_testdir -i
+ dh_testroot -i
+ dh_installdocs -i README NEWS AUTHORS
+ dh_installexamples -i
+ dh_installchangelogs ChangeLog -i
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_python -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
# Build architecture-dependent files here.
binary-arch: build install
- dh_testdir
- dh_testroot
+ dh_testdir -a
+ dh_testroot -a
- dh_install --sourcedir=debian/tmp
dh_installdocs -A README NEWS AUTHORS
- dh_installdocs
dh_installchangelogs ChangeLog
- dh_installman
dh_installexamples
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_perl
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_python -a
+ dh_makeshlibs -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
-binary: binary-indep binary-arch
+binary: binary-arch binary-indep
.PHONY: build clean binary-indep binary-arch binary install
--- NEW FILE: watch ---
version=2
http://cairographics.org/snapshots/ pycairo-([\d+\.]+|\d+)\.tar\.gz debian uupdate
More information about the cairo-commit
mailing list