From 35cbc51a3b1ef1ad7a619826d3877b37f6da515b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 18 Jan 2014 15:43:42 +0100
Subject: Build sip4-tqt as python module on Debian and Ubuntu

---
 .../squeeze/dependencies/sip4-tqt/debian/control   |  84 ++----------
 debian/squeeze/dependencies/sip4-tqt/debian/dh_sip |  47 -------
 .../dependencies/sip4-tqt/debian/dh_sip_tqt        |  47 +++++++
 .../dependencies/sip4-tqt/debian/manpages/dh_sip.1 | 149 ---------------------
 .../sip4-tqt/debian/manpages/dh_sip_tqt.1          | 149 +++++++++++++++++++++
 .../sip4-tqt/debian/python-sip-dev.docs            |   2 -
 .../sip4-tqt/debian/python-sip-dev.install         |   1 -
 .../sip4-tqt/debian/python-sip-dev.links           |   1 -
 .../sip4-tqt/debian/python-sip-dev.manpages        |   2 -
 .../sip4-tqt/debian/python-sip-tqt-dev.docs        |   2 +
 .../sip4-tqt/debian/python-sip-tqt-dev.install     |   1 +
 .../sip4-tqt/debian/python-sip-tqt-dev.links       |   1 +
 .../sip4-tqt/debian/python-sip-tqt-dev.manpages    |   2 +
 .../sip4-tqt/debian/python-sip-tqt.install         |   1 +
 .../sip4-tqt/debian/python-sip.install             |   1 -
 debian/squeeze/dependencies/sip4-tqt/debian/rules  |  51 +++----
 .../dependencies/sip4-tqt/debian/sipconfig.py      |   2 +-
 17 files changed, 244 insertions(+), 299 deletions(-)
 delete mode 100755 debian/squeeze/dependencies/sip4-tqt/debian/dh_sip
 create mode 100644 debian/squeeze/dependencies/sip4-tqt/debian/dh_sip_tqt
 delete mode 100644 debian/squeeze/dependencies/sip4-tqt/debian/manpages/dh_sip.1
 create mode 100644 debian/squeeze/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
 delete mode 100644 debian/squeeze/dependencies/sip4-tqt/debian/python-sip-dev.docs
 delete mode 100644 debian/squeeze/dependencies/sip4-tqt/debian/python-sip-dev.install
 delete mode 100644 debian/squeeze/dependencies/sip4-tqt/debian/python-sip-dev.links
 delete mode 100644 debian/squeeze/dependencies/sip4-tqt/debian/python-sip-dev.manpages
 create mode 100644 debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs
 create mode 100644 debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
 create mode 100644 debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links
 create mode 100644 debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
 create mode 100644 debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt.install
 delete mode 100644 debian/squeeze/dependencies/sip4-tqt/debian/python-sip.install

(limited to 'debian/squeeze')

diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/control b/debian/squeeze/dependencies/sip4-tqt/debian/control
index 6559a92b2..bc0f49bc7 100644
--- a/debian/squeeze/dependencies/sip4-tqt/debian/control
+++ b/debian/squeeze/dependencies/sip4-tqt/debian/control
@@ -8,11 +8,11 @@ Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, p
 Standards-Version: 3.8.4
 XS-Python-Version: all
 
-Package: python-sip
+Package: python-sip-tqt
 Architecture: any
 Section: python
-Replaces: python-sip (<< 4:14.0.0~)
-Breaks: python-sip (<< 4:14.0.0~)
+Replaces: python-sip-tqt (<< 4:14.0.0~)
+Breaks: python-sip-tqt (<< 4:14.0.0~)
 Provides: ${python:Provides}, sip-api-7.0, sip-api-7.1
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: python-sip4 (<< 4.10)
@@ -21,14 +21,14 @@ Description: Python/C++ bindings generator runtime library
  borrowed from SWIG, but capable of tighter bindings because of its
  specificity towards C++ and Python.
 
-Package: python-sip-dbg
+Package: python-sip-tqt-dbg
 Priority: extra
 Architecture: any
-Replaces: python-sip-dbg (<< 4:14.0.0~)
-Breaks: python-sip-dbg (<< 4:14.0.0~)
+Replaces: python-sip-tqt-dbg (<< 4:14.0.0~)
+Breaks: python-sip-tqt-dbg (<< 4:14.0.0~)
 Section: debug
 Provides: ${python:Provides}
-Depends: python-sip (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
+Depends: python-sip-tqt (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: python-sip4-dbg (<< 4.10)
 Description: Python/C++ bindings generator runtime library (debug extension)
  SIP is a tool for generating bindings for C++ classes with some ideas
@@ -37,15 +37,15 @@ Description: Python/C++ bindings generator runtime library (debug extension)
  .
  This package contains the extension built for the Python debug interpreter.
 
-Package: python-sip-dev
+Package: python-sip-tqt-dev
 Architecture: any
 Section: python
-Replaces: python-sip-dev (<< 4:14.0.0~)
-Breaks: python-sip-dev (<< 4:14.0.0~)
-Depends: ${python:Depends}, python-sip (= ${binary:Version}), python-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
-Recommends: python-sip (>= ${source:Version})
-Provides: python-sip4-dev, sip4
-Conflicts: python-sip4-dev (<< 4.10), sip4 (<< 4.10)
+Replaces: python-sip-tqt-dev (<< 4:14.0.0~)
+Breaks: python-sip-tqt-dev (<< 4:14.0.0~)
+Depends: ${python:Depends}, python-sip-tqt (= ${binary:Version}), python-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
+Recommends: python-sip-tqt (>= ${source:Version})
+Provides: python-sip-dev, python-sip4-dev, sip4
+Conflicts: python-sip-dev, python-sip4-dev (<< 4.10), sip4 (<< 4.10)
 Description: Python/C++ bindings generator development files
  SIP is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
@@ -68,59 +68,3 @@ Description: Python/C++ bindings generator development files
  This package contains the code generator tool and the development headers
  needed to develop Python bindings with sip.
 
-Package: python-sip4
-Architecture: all
-Section: python
-Replaces: python-sip4 (<< 4:14.0.0~)
-Breaks: python-sip4 (<< 4:14.0.0~)
-Depends: python-sip, ${misc:Depends}
-Description: Python/C++ bindings generator runtime library (transitional package)
- SIP is a tool for generating bindings for C++ classes with some ideas
- borrowed from SWIG, but capable of tighter bindings because of its
- specificity towards C++ and Python.
- .
- This is a transitional package that depends on python-sip. 
- It can be safely removed.
- 
-Package: sip4
-Architecture: all
-Section: python
-Replaces: sip4 (<< 4:14.0.0~)
-Breaks: sip4 (<< 4:14.0.0~)
-Depends: python-sip-dev, ${misc:Depends}
-Description: Python/C++ bindings generator (transitional package)
- SIP is a tool for generating bindings for C++ classes with some ideas
- borrowed from SWIG, but capable of tighter bindings because of its
- specificity towards C++ and Python.
- .
- This is a transitional package that depends on python-sip-dev. 
- It can be safely removed.
-
-Package: python-sip4-dev
-Architecture: all
-Section: python
-Replaces: python-sip4-dev (<< 4:14.0.0~)
-Breaks: python-sip4-dev (<< 4:14.0.0~)
-Depends: python-sip-dev, ${misc:Depends}
-Description: Python/C++ bindings generator development files (transitional package)
- SIP is a tool for generating bindings for C++ classes with some ideas
- borrowed from SWIG, but capable of tighter bindings because of its
- specificity towards C++ and Python.
- .
- This is a transitional package that depends on python-sip-dev. 
- It can be safely removed.
-
-Package: python-sip4-dbg
-Architecture: all
-Section: debug
-Replaces: python-sip4-dbg (<< 4:14.0.0~)
-Breaks: python-sip4-dbg (<< 4:14.0.0~)
-Priority: extra
-Depends: python-sip-dbg, ${misc:Depends}
-Description: Python/C++ bindings generator runtime library (debug, transitional package)
- SIP is a tool for generating bindings for C++ classes with some ideas
- borrowed from SWIG, but capable of tighter bindings because of its
- specificity towards C++ and Python.
- .
- This is a transitional package that depends on python-sip-dev. 
- It can be safely removed.
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/dh_sip b/debian/squeeze/dependencies/sip4-tqt/debian/dh_sip
deleted file mode 100755
index 54d861884..000000000
--- a/debian/squeeze/dependencies/sip4-tqt/debian/dh_sip
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/perl -w
-
-=head1 NAME
-
-dh_sip - set the correct dependencies for Python packages using sip
-
-=cut
-
-use strict;
-use Debian::Debhelper::Dh_Lib;
-
-=head1 SYNOPSIS
-
-B<dh_sip> 
-
-=head1 DESCRIPTION
-
-dh_sip creates the ${sip:Depends} substitution variable which must be used by
-Python extensions built with sip in order to depend on a version of python-sip
-that exports the correct public API. 
-
-=cut
-
-init();
-
-my $sip_provides = `dpkg -s python-sip`;
-$sip_provides =~ /^Provides:\s*(.+)$/m;
-
-my @sip_apis = sort(grep(/sip\-api/, split(/,\s*/, $1)));
-
-my $sip_api_version=$sip_apis[-1];
-
-foreach my $package (@{$dh{DOPACKAGES}}) {
-        addsubstvar($package, "sip:Depends", $sip_api_version);
-}
-
-=head1 SEE ALSO
-
-L<debhelper(7)>
-
-This program is a part of python-sip-dev but is made to work with debhelper.
-
-=head1 AUTHORS
-
-Torsten Marek <shlomme@debian.org>
-
-=cut
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/dh_sip_tqt b/debian/squeeze/dependencies/sip4-tqt/debian/dh_sip_tqt
new file mode 100644
index 000000000..b1a8c19e3
--- /dev/null
+++ b/debian/squeeze/dependencies/sip4-tqt/debian/dh_sip_tqt
@@ -0,0 +1,47 @@
+#!/usr/bin/perl -w
+
+=head1 NAME
+
+dh_sip_tqt - set the correct dependencies for Python packages using sip
+
+=cut
+
+use strict;
+use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+B<dh_sip_tqt>
+
+=head1 DESCRIPTION
+
+dh_sip_tqt creates the ${sip:Depends} substitution variable which must be used by
+Python extensions built with sip in order to depend on a version of python-sip
+that exports the correct public API. 
+
+=cut
+
+init();
+
+my $sip_provides = `dpkg -s python-sip-tqt`;
+$sip_provides =~ /^Provides:\s*(.+)$/m;
+
+my @sip_apis = sort(grep(/sip\-api/, split(/,\s*/, $1)));
+
+my $sip_api_version=$sip_apis[-1];
+
+foreach my $package (@{$dh{DOPACKAGES}}) {
+        addsubstvar($package, "sip:Depends", $sip_api_version);
+}
+
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is a part of python-sip-dev but is made to work with debhelper.
+
+=head1 AUTHORS
+
+Torsten Marek <shlomme@debian.org>
+
+=cut
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/manpages/dh_sip.1 b/debian/squeeze/dependencies/sip4-tqt/debian/manpages/dh_sip.1
deleted file mode 100644
index 989c5fc3c..000000000
--- a/debian/squeeze/dependencies/sip4-tqt/debian/manpages/dh_sip.1
+++ /dev/null
@@ -1,149 +0,0 @@
-.\" 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_SIP 1"
-.TH DH_SIP 1 "2010-02-02" "perl v5.10.1" "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_sip \- set the correct dependencies for Python packages using sip
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-\&\fBdh_sip\fR
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-dh_sip creates the ${sip:Depends} substitution variable which must be used by
-Python extensions built with sip in order to depend on a version of python-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 python-sip-dev but is made to work with debhelper.
-.SH "AUTHORS"
-.IX Header "AUTHORS"
-Torsten Marek <shlomme@debian.org>
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 b/debian/squeeze/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
new file mode 100644
index 000000000..ea429fe9a
--- /dev/null
+++ b/debian/squeeze/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
@@ -0,0 +1,149 @@
+.\" 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_SIP_TQT 1"
+.TH DH_SIP_TQT 1 "2010-02-02" "perl v5.10.1" "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_sip_tqt \- set the correct dependencies for Python packages using sip
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBdh_sip_tqt\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+dh_sip_tqt creates the ${sip:Depends} substitution variable which must be used by
+Python extensions built with sip in order to depend on a version of python-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 python-sip-dev but is made to work with debhelper.
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Torsten Marek <shlomme@debian.org>
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-dev.docs b/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-dev.docs
deleted file mode 100644
index 416a453aa..000000000
--- a/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-dev.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-doc/html
-NEWS
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-dev.install b/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-dev.install
deleted file mode 100644
index 1df36c612..000000000
--- a/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/*
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-dev.links b/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-dev.links
deleted file mode 100644
index 26a9ded9b..000000000
--- a/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/python-sip-dev/html/_static/jquery.js
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-dev.manpages b/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-dev.manpages
deleted file mode 100644
index a4e96a394..000000000
--- a/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-dev.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/manpages/sip.1
-debian/manpages/dh_sip.1
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs b/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs
new file mode 100644
index 000000000..416a453aa
--- /dev/null
+++ b/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs
@@ -0,0 +1,2 @@
+doc/html
+NEWS
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install b/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
new file mode 100644
index 000000000..1df36c612
--- /dev/null
+++ b/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
@@ -0,0 +1 @@
+usr/bin/*
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links b/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links
new file mode 100644
index 000000000..fdd5af4cc
--- /dev/null
+++ b/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/python-sip-tqt-dev/html/_static/jquery.js
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages b/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
new file mode 100644
index 000000000..ba33bb512
--- /dev/null
+++ b/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
@@ -0,0 +1,2 @@
+debian/manpages/sip.1
+debian/manpages/dh_sip_tqt.1
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt.install b/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt.install
new file mode 100644
index 000000000..9639c2814
--- /dev/null
+++ b/debian/squeeze/dependencies/sip4-tqt/debian/python-sip-tqt.install
@@ -0,0 +1 @@
+usr/lib/python*/*-packages/sip4_tqt/sip.so
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/python-sip.install b/debian/squeeze/dependencies/sip4-tqt/debian/python-sip.install
deleted file mode 100644
index f43a3a265..000000000
--- a/debian/squeeze/dependencies/sip4-tqt/debian/python-sip.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/sip.so
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/rules b/debian/squeeze/dependencies/sip4-tqt/debian/rules
index 641b5cabd..df0c6da05 100755
--- a/debian/squeeze/dependencies/sip4-tqt/debian/rules
+++ b/debian/squeeze/dependencies/sip4-tqt/debian/rules
@@ -40,7 +40,7 @@ build-%/configure-stamp:
 	mkdir -p build-$*
 	cd build-$* \
 		&& python$* ../configure.py \
-			-d /usr/lib/python$*/$(call py_sitename,$*) \
+			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
 			-u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE=""
 	touch $@
 
@@ -49,7 +49,7 @@ dbg-build-%/configure-stamp:
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* \
 		&& python$*-dbg ../configure.py \
-			-d /usr/lib/python$*/$(call py_sitename,$*) \
+			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
 			-e /usr/include/python$*_d \
 			-u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP=""
 	touch $@
@@ -88,35 +88,36 @@ install-arch: build
 		$(MAKE) -f debian/rules install-arch-$$p;\
 	done
 
-	for i in $$(find debian/python-sip-dbg -name '*.so'); do \
+	for i in $$(find debian/python-sip-tqt-dbg -name '*.so'); do \
 		b=$$(basename $$i .so); \
 		mv $$i $$(dirname $$i)/$${b}_d.so; \
 	done
-	find debian/python-sip-dbg ! -type d ! -name '*_d.*' | xargs rm -f
-	find debian/python-sip-dbg -depth -empty -exec rmdir {} \;
+	find debian/python-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f
+	find debian/python-sip-tqt-dbg -depth -empty -exec rmdir {} \;
 
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-	install -m 755 -o root -g root debian/dh_sip debian/python-sip-dev/usr/bin
+	install -m 755 -o root -g root debian/dh_sip_tqt debian/python-sip-tqt-dev/usr/bin
 
 install-arch-%:
 	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
-	$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-sip-dbg
-	mkdir -p debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/
-	install -m 644 -o root -g root debian/sipconfig.py debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/
-	install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_nd.py
+	$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-sip-tqt-dbg
+	mkdir -p debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/
+	touch debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/__init__.py
+	install -m 644 -o root -g root debian/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/
+	install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_nd.py
 ifneq (dh_pysupport,${DH_PYTHON2})
 	# install *_d.py into wrong package to prevent deletion in dh_python2
-	install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_d.py
+	install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_d.py
 else
-	install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-dbg/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_d.py
+	install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_d.py
 endif
-	mkdir -p debian/python-sip-dev/usr/include/python$*
-	install -m 644 -o root -g root siplib/sip.h debian/python-sip-dev/usr/include/python$*/
-	mkdir -p debian/python-sip-dev/usr/include/python$*_d
+	mkdir -p debian/python-sip-tqt-dev/usr/include/python$*
+	install -m 644 -o root -g root siplib/sip.h debian/python-sip-tqt-dev/usr/include/python$*/
+	mkdir -p debian/python-sip-tqt-dev/usr/include/python$*_d
 	ln -s ../python$*/sip.h \
-	    debian/python-sip-dev/usr/include/python$*_d/sip.h
-	mkdir -p debian/python-sip-dev/usr/lib/python$*/$(call py_sitename,$*)
-	install -m 644 -o root -g root sipdistutils.py debian/python-sip-dev/usr/lib/python$*/$(call py_sitename,$*)
+	    debian/python-sip-tqt-dev/usr/include/python$*_d/sip.h
+	mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt
+	install -m 644 -o root -g root sipdistutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt
 
 
 # Must not depend on anything. This is to be called by
@@ -132,20 +133,20 @@ binary-common:
 	dh_link
 # don't call strip twice, it's in binary-common
 ifneq (,$(findstring -a, $(DH_OPTIONS)))
-	DH_OPTIONS= dh_strip -ppython-sip-dev
-	DH_OPTIONS= dh_strip -ppython-sip -Npython-sip-dev --dbg-package=python-sip-dbg
-	rm -rf debian/python-sip-dbg/usr/share/doc/python-sip-dbg
-	mkdir -p debian/python-sip-dbg/usr/share/doc
-	ln -s python-sip debian/python-sip-dbg/usr/share/doc/python-sip-dbg
+	DH_OPTIONS= dh_strip -ppython-sip-tqt-dev
+	DH_OPTIONS= dh_strip -ppython-sip-tqt -Npython-sip-tqt-dev --dbg-package=python-sip-tqt-dbg
+	rm -rf debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg
+	mkdir -p debian/python-sip-tqt-dbg/usr/share/doc
+	ln -s python-sip-tqt debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg
 endif
 	dh_compress 
 	dh_fixperms
 	${DH_PYTHON2}
 ifneq (dh_pysupport,${DH_PYTHON2})
 	# move *_d.py back into right package
-	find debian/python-sip -name "*_d.py" | \
+	find debian/python-sip-tqt -name "*_d.py" | \
 	while read f; do \
-	    f1="debian/python-sip-dbg/$${f#debian/python-sip/}"; \
+	    f1="debian/python-sip-tqt-dbg/$${f#debian/python-sip-tqt/}"; \
 	    mkdir -p "$${f1%/*}"; \
 	    mv "$${f}" "$${f1}" ; \
 	done
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/sipconfig.py b/debian/squeeze/dependencies/sip4-tqt/debian/sipconfig.py
index f23b5427a..a9e761f08 100644
--- a/debian/squeeze/dependencies/sip4-tqt/debian/sipconfig.py
+++ b/debian/squeeze/dependencies/sip4-tqt/debian/sipconfig.py
@@ -7,7 +7,7 @@ if getattr(sys, "pydebug", False):
         from sipconfig_d import *
         from sipconfig_d import _pkg_config, _default_macros
     except ImportError, msg:
-        raise ImportError, 'No module named sipconfig; package python-sip4-dbg not installed'
+        raise ImportError, 'No module named sipconfig; package python-sip-tqt-dbg not installed'
 else:
     from sipconfig_nd import *
     from sipconfig_nd import _pkg_config, _default_macros
-- 
cgit v1.2.1