[Python-modules-commits] r20064 - in packages/sip4/trunk/debian (8 files)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Sat Jan 21 07:04:42 UTC 2012


    Date: Saturday, January 21, 2012 @ 07:04:40
  Author: kitterman
Revision: 20064

* Add myself to uploaders
* Add debian/dh_sip3 and debian/manpages/dh_sip3.1.  Adjust
  python3-sip-dev.install and add python3-sip-dev.manpages to ship dh_sip3
  for python3 packages
* Add removal of generated files in siplib to clean rule
* Instead of using upstream embedded copy of underscore.js, add
  libjs-underscore to python-sip-dev depends and symlink to the docs

Added:
  packages/sip4/trunk/debian/dh_sip3
  packages/sip4/trunk/debian/manpages/dh_sip3.1
  packages/sip4/trunk/debian/python3-sip-dev.manpages
Modified:
  packages/sip4/trunk/debian/changelog
  packages/sip4/trunk/debian/control
  packages/sip4/trunk/debian/python-sip-dev.links
  packages/sip4/trunk/debian/python3-sip-dev.install
  packages/sip4/trunk/debian/rules

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2012-01-20 23:23:56 UTC (rev 20063)
+++ packages/sip4/trunk/debian/changelog	2012-01-21 07:04:40 UTC (rev 20064)
@@ -1,3 +1,15 @@
+sip4 (4.13.1-3) unstable; urgency=low
+
+  * Add myself to uploaders
+  * Add debian/dh_sip3 and debian/manpages/dh_sip3.1.  Adjust
+    python3-sip-dev.install and add python3-sip-dev.manpages to ship dh_sip3
+    for python3 packages
+  * Add removal of generated files in siplib to clean rule
+  * Instead of using upstream embedded copy of underscore.js, add
+    libjs-underscore to python-sip-dev depends and symlink to the docs
+
+ -- Scott Kitterman <scott at kitterman.com>  Sat, 21 Jan 2012 01:49:54 -0500
+
 sip4 (4.13.1-2) unstable; urgency=low
 
   * Team upload

Modified: packages/sip4/trunk/debian/control
===================================================================
--- packages/sip4/trunk/debian/control	2012-01-20 23:23:56 UTC (rev 20063)
+++ packages/sip4/trunk/debian/control	2012-01-21 07:04:40 UTC (rev 20064)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Torsten Marek <shlomme at debian.org>, Michael Casadevall <mcasadevall at debian.org>
+Uploaders: Torsten Marek <shlomme at debian.org>, Michael Casadevall <mcasadevall at debian.org>, Scott Kitterman <scott at kitterman.com>
 Build-Depends: debhelper (>= 7), python-all-dev (>= 2.6.7-3~), python-all-dbg, python3-all-dev (>= 3.2.2~rc1-1~), python3-all-dbg
 Standards-Version: 3.9.2
 Homepage: http://www.riverbankcomputing.co.uk/software/sip/
@@ -41,7 +41,8 @@
 Package: python-sip-dev
 Architecture: any
 Section: python
-Depends: ${python:Depends}, python-sip (= ${binary:Version}), python-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
+Depends: ${python:Depends}, python-sip (= ${binary:Version}), python-dev,
+ ${shlibs:Depends}, libjs-jquery, libjs-underscore, ${misc:Depends}
 Recommends: python-sip (>= ${source:Version})
 Description: Python/C++ bindings generator development files
  SIP is a tool for generating bindings for C++ classes with some ideas

Added: packages/sip4/trunk/debian/dh_sip3
===================================================================
--- packages/sip4/trunk/debian/dh_sip3	                        (rev 0)
+++ packages/sip4/trunk/debian/dh_sip3	2012-01-21 07:04:40 UTC (rev 20064)
@@ -0,0 +1,49 @@
+#!/usr/bin/perl -w
+
+=head1 NAME
+
+dh_sip3 - set the correct dependencies for Python3 packages using sip
+
+=cut
+
+use strict;
+use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+B<dh_sip> 
+
+=head1 DESCRIPTION
+
+dh_sip3 creates the ${sip3:Depends} substitution variable which must be used
+by Python3 extensions built with sip in order to depend on a version of
+python3-sip that exports the correct public API. 
+
+=cut
+
+init();
+
+my $sip3_provides = `dpkg -s python3-sip`;
+$sip3_provides =~ /^Provides:\s*(.+)$/m;
+
+my @sip3_apis = sort(grep(/sip\-py3api/, split(/,\s*/, $1)));
+
+my $sip3_api_version=$sip3_apis[-1];
+
+foreach my $package (@{$dh{DOPACKAGES}}) {
+        addsubstvar($package, "sip3:Depends", $sip3_api_version);
+}
+
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is a part of python3-sip-dev but is made to work with debhelper.
+
+=head1 AUTHORS
+
+Torsten Marek <shlomme at debian.org>
+Adapted for Python3 by
+Scott Kitterman <scott at kitterman.com>
+
+=cut

Added: packages/sip4/trunk/debian/manpages/dh_sip3.1
===================================================================
--- packages/sip4/trunk/debian/manpages/dh_sip3.1	                        (rev 0)
+++ packages/sip4/trunk/debian/manpages/dh_sip3.1	2012-01-21 07:04:40 UTC (rev 20064)
@@ -0,0 +1,150 @@
+.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.el \{\
+.    de IX
+..
+.\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "DH_SIP3 1"
+.TH DH_SIP3 1 "2012-01-21" "perl v5.14.2" "User Contributed Perl Documentation"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+dh_sip3 \- set the correct dependencies for Python3 packages using sip
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBdh_sip\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+dh_sip3 creates the ${sip3:Depends} substitution variable which must be used by
+Python3 extensions built with sip in order to depend on a version of
+python3-sip that exports the correct public \s-1API\s0.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fIdebhelper\fR\|(7)
+.PP
+This program is a part of python3-sip-dev but is made to work with debhelper.
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Torsten Marek <shlomme at debian.org>
+Adapted for Python3 by Scott Kitterman <scott at kitterman.com>

Modified: packages/sip4/trunk/debian/python-sip-dev.links
===================================================================
--- packages/sip4/trunk/debian/python-sip-dev.links	2012-01-20 23:23:56 UTC (rev 20063)
+++ packages/sip4/trunk/debian/python-sip-dev.links	2012-01-21 07:04:40 UTC (rev 20064)
@@ -1 +1,2 @@
 usr/share/javascript/jquery/jquery.js usr/share/doc/python-sip-dev/html/_static/jquery.js
+usr/share/javascript/underscore/underscore.min.js usr/share/doc/python-sip-dev/html/_static/underscore.js

Modified: packages/sip4/trunk/debian/python3-sip-dev.install
===================================================================
--- packages/sip4/trunk/debian/python3-sip-dev.install	2012-01-20 23:23:56 UTC (rev 20063)
+++ packages/sip4/trunk/debian/python3-sip-dev.install	2012-01-21 07:04:40 UTC (rev 20064)
@@ -1 +1,2 @@
 usr/lib/python3*/*-packages/sipdistutils.py
+../../debian/dh_sip3 usr/bin

Added: packages/sip4/trunk/debian/python3-sip-dev.manpages
===================================================================
--- packages/sip4/trunk/debian/python3-sip-dev.manpages	                        (rev 0)
+++ packages/sip4/trunk/debian/python3-sip-dev.manpages	2012-01-21 07:04:40 UTC (rev 20064)
@@ -0,0 +1 @@
+debian/manpages/dh_sip3.1

Modified: packages/sip4/trunk/debian/rules
===================================================================
--- packages/sip4/trunk/debian/rules	2012-01-20 23:23:56 UTC (rev 20063)
+++ packages/sip4/trunk/debian/rules	2012-01-21 07:04:40 UTC (rev 20064)
@@ -4,7 +4,7 @@
 
 PY2_PROVIDES=sip-api-8.0, sip-api-8.1
 PY3_PROVIDES=sip-py3api-8.0, sip-py3api-8.1
-# `dh_python3 --depends sip` should generate dependency on newest API only
+# `dh_python3 --depends sip3` should generate dependency on newest API only
 PYDIST=sip $(shell python -c "a=[i.strip() for i in '$(PY3_PROVIDES)'.split(',')]; print sorted(a, reverse=True)[0]")
 
 INSTDIR=$(CURDIR)/debian
@@ -70,6 +70,7 @@
 	dh_testdir
 	dh_testroot
 	rm -rf *-stamp siputils.pyc __pycache__ $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
+	rm -rf $(CURDIR)/siplib/sip.h $(CURDIR)/siplib/siplib.c $(CURDIR)/siplib/siplib.sbf
 	dh_clean debian/python3-sip.pydist
 
 install-arch: build




More information about the Python-modules-commits mailing list