[cairo-commit] packaging/debian/pycairo/debian changelog, 1.2, 1.3 control, 1.2, 1.3 python2.4-cairo.examples, NONE, 1.1 rules, 1.1, 1.2

Tue May 31 04:16:47 PDT 2005

Committed by: dajobe

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

Modified Files:
	changelog control rules 
Added Files:
	python2.4-cairo.examples 
Log Message:
Added python2.4-cairo package, stopped using cdbs for now

Index: changelog
===================================================================
RCS file: /cvs/cairo/packaging/debian/pycairo/debian/changelog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3

--- changelog	4 Apr 2005 23:48:54 -0000	1.2
+++ changelog	31 May 2005 11:16:44 -0000	1.3
@@ -1,3 +1,10 @@
+pycairo (0.4.0-3) unstable; urgency=low
+
+  * Add python2.4-cairo package
+  * Switch to debhelper from cdbs to hand-drive the 2-python builds
+
+ -- Dave Beckett <dajobe at debian.org>  Mon, 30 May 2005 22:25:00 +0100
+
 pycairo (0.4.0-2) unstable; urgency=low
 
   * Require libsvg-cairo1-dev >= 0.1.5-4 with fixed build dependencies.

Index: control
===================================================================
RCS file: /cvs/cairo/packaging/debian/pycairo/debian/control,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- control	4 Apr 2005 23:49:01 -0000	1.2
+++ control	31 May 2005 11:16:44 -0000	1.3
@@ -2,7 +2,7 @@
 Section: python
 Priority: optional
 Maintainer: Dave Beckett <dajobe at debian.org>
-Build-Depends: debhelper (>> 4.1.0), cdbs, autotools-dev, pkg-config, python2.3-dev, python2.3-numeric, libcairo1-dev (>= 0.4.0), libsvg-cairo1-dev (>= 0.1.5-4), libgtk2.0-dev (>= 2.0.0), python-gtk2-dev (>= 1.99.16)
+Build-Depends: debhelper (>> 4.1.0), autotools-dev, pkg-config, python2.3-dev, python2.3-numeric, python2.4-dev, python2.4-numeric, libcairo1-dev (>= 0.4.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
 
 Package: python2.3-cairo
@@ -13,3 +13,11 @@
  This package contains the files needed to use the Cairo vectory 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
+ library in Python 2.4 programs.
+

--- NEW FILE: python2.4-cairo.examples ---
examples/gtk/hangman.py

Index: rules
===================================================================
RCS file: /cvs/cairo/packaging/debian/pycairo/debian/rules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rules	4 Apr 2005 20:13:09 -0000	1.1
+++ rules	31 May 2005 11:16:44 -0000	1.2
@@ -1,10 +1,146 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/class/makefile.mk
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
 
-common-binary-post-install-arch::
-	cd debian/python2.3-cairo/usr/lib/python2.3/site-packages/cairo; \
-	rm -f *.la *.pyc
-	cd debian/python2.3-cairo/usr/share/doc/python2.3-cairo; \
-	chmod 755 examples/*.py
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+# For autoconf 2.13 only
+CONFFLAGS=
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+	CONFFLAGS += $(DEB_HOST_GNU_TYPE)
+else
+	CONFFLAGS += --host $(DEB_BUILD_GNU_TYPE) --build $(DEB_HOST_GNU_TYPE)
+endif
+
+package := tmp
+destdir := $(PWD)/debian/$(package)
+prefix  := /usr
+share   := $(prefix)/share
+
+version := $(shell dpkg-parsechangelog | \
+		sed -ne 's/^Version: *\([0-9]\+:\)*//p')
+
+PYTHON=python2.3
+export PYTHON
+
+PYTHON2=python2.4
+export PYTHON2
+
+
+configure-stamp:
+	dh_testdir
+
+# Copy in fresh copies of config.{sub,guess}
+# (these are from autotools-dev, so must Build-Depend on it)
+	for i in config.guess config.sub; do \
+	  if test -e /usr/share/misc/$$i ; then \
+	    if ! test -e $$i.debian-orig ; then \
+	      mv $$i $$i.debian-orig ; \
+	      cp --remove-destination /usr/share/misc/$$i $$i ; \
+	    fi ; \
+	  fi ; \
+	done
+
+# handle timestamp skew; advice from autotools-dev README.Debian
+	touch configure.ac && \
+	touch aclocal.m4 && \
+	touch config.h.in && \
+	touch configure && \
+	touch Makefile.in
+
+	touch $@
+
+
+build: configure-stamp build-stamp
+build-stamp:
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp libtool
+
+	-$(MAKE) distclean
+
+	-rm -f config.h config.cache config.status config.log
+
+	for i in config.guess config.sub; do \
+	  if test -r $$i.debian-orig ; then \
+	    mv -f $$i.debian-orig $$i; \
+	  fi; \
+	done
+
+	dh_clean
+
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	PYTHON=$(PYTHON); \
+	./configure $(CONFFLAGS) \
+		--prefix=$(prefix) \
+		--mandir=$(share)/man \
+		--infodir=$(share)/info
+
+	PYTHON=$(PYTHON); \
+	PYTHON=$$PYTHON make install DESTDIR=$(CURDIR)/debian/$$PYTHON-cairo; \
+	find $(CURDIR)/debian/$$PYTHON-cairo/usr/lib \( -name "*.py[co]" -o -name "*.la" \) -exec rm -f {} \;
+
+	$(MAKE) clean
+
+	PYTHON=$(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 {} \;
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+
+	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
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install


