[cairo-commit] packaging/debian/pycairo/debian changelog, 1.5, 1.6 control, 1.5, 1.6 rules, 1.4, 1.5

[Dave Beckett]

Committed by: dajobe

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

Modified Files:
	changelog control rules 
Log Message:
pycairo 0.6.0-2

Index: changelog
===================================================================
RCS file: /cvs/cairo/packaging/debian/pycairo/debian/changelog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- changelog	1 Aug 2005 21:28:52 -0000	1.5
+++ changelog	4 Aug 2005 18:34:23 -0000	1.6
@@ -1,3 +1,10 @@
+pycairo (0.6.0-2) unstable; urgency=low
+
+  * debian/rules: disable use of pygtk, as pygtk 2.7+ ships with the
+    cairo.gtk functions.  Prevents circular dependency.
+
+ -- Dave Beckett <dajobe at debian.org>  Thu,  4 Aug 2005 15:22:26 +0100
+
 pycairo (0.6.0-1) unstable; urgency=low
 
   * New upstream release

Index: control
===================================================================
RCS file: /cvs/cairo/packaging/debian/pycairo/debian/control,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- control	1 Aug 2005 21:28:52 -0000	1.5
+++ control	4 Aug 2005 18:34:23 -0000	1.6
@@ -2,7 +2,7 @@
 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.6.0-dev, libgtk2.0-dev (>= 2.0.0), python-gtk2-dev (>= 1.99.16)
+Build-Depends: debhelper (>> 4.1.0), autotools-dev, pkg-config, python, python2.3-dev, python2.3-numeric, python2.4-dev, python2.4-numeric, libcairo0.6.0-dev
 Standards-Version: 3.6.2
 
 Package: python-cairo

Index: rules
===================================================================
RCS file: /cvs/cairo/packaging/debian/pycairo/debian/rules,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rules	1 Aug 2005 21:28:52 -0000	1.4
+++ rules	4 Aug 2005 18:34:23 -0000	1.5
@@ -97,7 +97,8 @@
 	./configure $(CONFFLAGS) \
 		--prefix=$(prefix) \
 		--mandir=$(share)/man \
-		--infodir=$(share)/info
+		--infodir=$(share)/info \
+		--without-pygtk
 
 	PYTHON=`which $(PYTHON1)`; \
 	PYTHON=$$PYTHON make install DESTDIR=$(CURDIR)/debian/$(PYTHON1)-cairo pythondir=/usr/lib/$(PYTHON1)/site-packages PYTHON_INCLUDES=-I/usr/include/$(PYTHON1); \
@@ -112,7 +113,8 @@
 	./configure $(CONFFLAGS) \
 		--prefix=$(prefix) \
 		--mandir=$(share)/man \
-		--infodir=$(share)/info
+		--infodir=$(share)/info \
+		--without-pygtk
 
 	PYTHON=`which $(PYTHON2)`; \
 	PYTHON=$$PYTHON make install DESTDIR=$(CURDIR)/debian/$(PYTHON2)-cairo pythondir=/usr/lib/$(PYTHON2)/site-packages PYTHON_INCLUDES=-I/usr/include/$(PYTHON2); \