diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-22 15:03:41 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-22 15:03:41 -0600 |
commit | 143b8ac9fa5ddfbdf0e755727aca5149e7f3fe26 (patch) | |
tree | 8d971cfbd68b2d7180f52d2753d04c0a8b1e985b /debian/lenny | |
parent | 99d9097f5e112ca8605e28ae36fd748c19d3e9b0 (diff) | |
download | tde-packaging-143b8ac9fa5ddfbdf0e755727aca5149e7f3fe26.tar.gz tde-packaging-143b8ac9fa5ddfbdf0e755727aca5149e7f3fe26.zip |
Fix sip4-tqt FTBFS on Ubuntu and add sip4-tqt to Debian
Diffstat (limited to 'debian/lenny')
21 files changed, 715 insertions, 0 deletions
diff --git a/debian/lenny/dependencies/sip4-tqt/debian/changelog b/debian/lenny/dependencies/sip4-tqt/debian/changelog new file mode 100644 index 000000000..6634575fe --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/changelog @@ -0,0 +1,9 @@ +sip4-tqt (4.10.5-0ubuntu1) maverick; urgency=low + + * New upstream release + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 22 Nov 2011 03:03:00 -0600 + +Local variables: +mode: debian-changelog +End: diff --git a/debian/lenny/dependencies/sip4-tqt/debian/compat b/debian/lenny/dependencies/sip4-tqt/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/lenny/dependencies/sip4-tqt/debian/control b/debian/lenny/dependencies/sip4-tqt/debian/control new file mode 100644 index 000000000..cab812c3e --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/control @@ -0,0 +1,116 @@ +Source: sip4-tqt +Section: devel +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> +Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org> +Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1) +Standards-Version: 3.8.4 +XS-Python-Version: all + +Package: python-sip +Architecture: any +Section: python +Provides: ${python:Provides}, sip-api-7.0, sip-api-7.1 +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Conflicts: python-sip4 (<< 4.10) +Replaces: python-sip4 (<< 4.10) +Description: Python/C++ bindings generator runtime library + 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. + +Package: python-sip-dbg +Priority: extra +Architecture: any +Section: debug +Provides: ${python:Provides} +Depends: python-sip (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends} +Conflicts: python-sip4-dbg (<< 4.10) +Replaces: 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 + borrowed from SWIG, but capable of tighter bindings because of its + specificity towards C++ and Python. + . + This package contains the extension built for the Python debug interpreter. + +Package: python-sip-dev +Architecture: any +Section: python +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-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 + specificity towards C++ and Python. + . + SIP was originally designed to generate Python bindings for KDE and so + has explicit support for the signal slot mechanism used by the Qt/KDE + class libraries. + . + Features: + - connecting Qt signals to Python functions and class methods + - connecting Python signals to Qt slots + - overloading virtual member functions with Python class methods + - protected member functions + - abstract classes + - enumerated types + - global class instances + - static member functions. + . + 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 +Depends: python-sip, ${misc:Depends} +Breaks: python-ball (<= 1.3.1-2), python-ballview (<= 1.3.1-2), python-qwt5-qt4 (<= 5.2.1~cvs20091107+dfsg-2), python-qwt5-qt3 (<= 5.2.1~cvs20091107+dfsg-2), python-qwt3d-qt4 (<= 0.1.7~cvs20090625-3), python-qwt3d-qt3 (<= 0.1.7~cvs20090625-3), python-qscintilla2 (<= 2.4-5) +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 +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 +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 +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/lenny/dependencies/sip4-tqt/debian/copyright b/debian/lenny/dependencies/sip4-tqt/debian/copyright new file mode 100644 index 000000000..b1fc4bd72 --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/copyright @@ -0,0 +1,80 @@ +This package was debianized by Ricardo Javier Cardenes Medina <rcardenes@debian.org> on +Tue, 10 Sep 2002 23:12:17 +0100 + +It was downloaded from http://www.riverbankcomputing.co.uk + +Upstream Author: Phil Thompson (phil@riverbankcomputing.co.uk) + +SIP4 is offered under GPLv2, GPLv3, and the SIP 4 license. The text +of the SIP license follows: + +RIVERBANK COMPUTING LIMITED LICENSE AGREEMENT FOR SIP 4.9 + +1. This LICENSE AGREEMENT is between Riverbank Computing Limited +("Riverbank"), and the Individual or Organization ("Licensee") accessing +and otherwise using SIP 4.9 software in source or binary form and its +associated documentation. SIP 4.9 comprises a software tool for +generating Python bindings for software C and C++ libraries, and a Python +extension module used at runtime by those generated bindings. + +2. Subject to the terms and conditions of this License Agreement, Riverbank +hereby grants Licensee a nonexclusive, royalty-free, world-wide license +to reproduce, analyze, test, perform and/or display publicly, prepare +derivative works, distribute, and otherwise use SIP 4.9 alone or in +any derivative version, provided, however, that Riverbank's License +Agreement and Riverbank's notice of copyright, e.g., "Copyright (c) 2009 +Riverbank Computing Limited; All Rights Reserved" are retained in +SIP 4.9 alone or in any derivative version prepared by Licensee. + +3. In the event Licensee prepares a derivative work that is based on +or incorporates SIP 4.9 or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to SIP 4.9. + +4. Licensee may not use SIP 4.9 to generate Python bindings for any +C or C++ library for which bindings are already provided by Riverbank. + +5. Riverbank is making SIP 4.9 available to Licensee on an "AS IS" +basis. RIVERBANK MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, RIVERBANK MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF SIP 4.9 WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +6. RIVERBANK SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF +SIP 4.9 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS +AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING SIP 4.9, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +7. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +8. Nothing in this License Agreement shall be deemed to create any +relationship of agency, partnership, or joint venture between Riverbank +and Licensee. This License Agreement does not grant permission to use +Riverbank trademarks or trade name in a trademark sense to endorse or +promote products or services of Licensee, or any third party. + +9. By copying, installing or otherwise using SIP 4.9, Licensee +agrees to be bound by the terms and conditions of this License Agreement. + +**** + +SIP is also licensed under the GPLv2 and GPLv3: + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation version 2 or 3 of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +On Debian systems, the complete text of the GNU General Public License 2 +can be found in `/usr/share/common-licenses/GPL-2'. The complete text of the +GNU General Public License 3 can be found in `/usr/share/common-licenses/GPL-3'. diff --git a/debian/lenny/dependencies/sip4-tqt/debian/dh_sip b/debian/lenny/dependencies/sip4-tqt/debian/dh_sip new file mode 100755 index 000000000..54d861884 --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/dh_sip @@ -0,0 +1,47 @@ +#!/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/lenny/dependencies/sip4-tqt/debian/docs b/debian/lenny/dependencies/sip4-tqt/debian/docs new file mode 100644 index 000000000..50bd824bb --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/docs @@ -0,0 +1,2 @@ +NEWS +README diff --git a/debian/lenny/dependencies/sip4-tqt/debian/manpages/dh_sip.1 b/debian/lenny/dependencies/sip4-tqt/debian/manpages/dh_sip.1 new file mode 100644 index 000000000..989c5fc3c --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/manpages/dh_sip.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 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/lenny/dependencies/sip4-tqt/debian/manpages/sip.1 b/debian/lenny/dependencies/sip4-tqt/debian/manpages/sip.1 new file mode 100644 index 000000000..ce178cc7e --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/manpages/sip.1 @@ -0,0 +1,86 @@ +.\" +.\" Created by Ricardo Cárdenes Medina <ricardo@conysis.com> +.\" for the Debian 'sip' package +.\" +.TH SIP 1 "2010/02/02" +.SH NAME +sip \- generates C++/Python bindings +.SH SYNOPSIS +.B sip +[\fI-h\fR] [\fI-V\fR] [\fI-a file\fR] [\fI-c dir\fR] [\fI-d file\fR] [\fI-e\fR] [\fI-g\fR] [\fI-I dir\fR] [\fI-j #\fR] [\fI-k\fR] [\fI-m file\fR] [\fI-o\fR] [\fI-p module\fR] [\fI-P\fR] [\fI-r\fR] [\fI-s suffix\fR] [\fI-t tag\fR] [\fI-w\fR] [\fI-x feature\fR] [\fI-z file\fR] [\fIfile\fR] +.SH DESCRIPTION +.B sip +takes a set of specification files and generates C++ code, documentation and build files. + +The format of the needed specification file is similar to a C++ header. +sip includes run-time support for the generated code. +.SH OPTIONS +.TP +.B \-h +Show summary of options. +.TP +.B \-V +Display the sip version number +.TP +.B \-a file +The name of the QScintilla API file. If not indicated, it will not +be generated. +.TP +.B \-b file +The name of the build file. If not indicated, it will not be generated. +.TP +.B \-c dir +The name of the directory where generated source file will be put. +If not indicated, no code will be generated. +.TP +.B -d file +The name of the documentation file. If not indicated, no documentation will be generated. +.TP +.B -e +Enable support for exceptions. Disabled by default. +.TP +.B -g +Always release and reaquire the GIL. +.TP +.B -I dir +Directory where sip can search for included files. +.TP +.B -j number +Splits the generated code in \fInumber\fR files (1 by default). This +flag was added for parallel compilation on SMP machines. +.TP +.B -m file +The name of the XML export file. If not indicated, the file will not be generated. +.TP +.B -p module +Give the name of the consolidated module this module should be a part of. +.TP +.B -P +Enable the protected/public hack. +.TP +.B -r +Enable tracing on generated code. +.TP +.B -s suffix +The suffix used for generated C or C++ files (".c" or ".cpp" if none specified) +.TP +.B -t tag +The primary version to tag generate code for. You only can specify those +defined with a %Timeline directive. If you don't specify one, sip +will generate the latest available. +.TP +.B -w +Enable warning messages +.TP +.B -x feature +Disable a feature +.TP +.B -z file +The name of a file containing additional command line flags +.TP +.B file +The name of the file containing the specification. If you skip it, +sip will expect to be fed by stdin. +.SH AUTHOR +This manual page was written by Ricardo Javier Cardenes Medina <rcardenes@debian.org> and Torsten Marek <shlomme@debian.org>, +for the Debian GNU/Linux system (but may be used by others). diff --git a/debian/lenny/dependencies/sip4-tqt/debian/patches/series b/debian/lenny/dependencies/sip4-tqt/debian/patches/series new file mode 100644 index 000000000..c42871d34 --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/patches/series @@ -0,0 +1,2 @@ +siputils_debian_changes.diff +siputils_objdir_module_fix.diff diff --git a/debian/lenny/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff b/debian/lenny/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff new file mode 100644 index 000000000..2640f57c2 --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_siputils.dpatch by Torsten Marek <shlomme@debian.org> +Index: sip4-qt3-4.10/siputils.py +=================================================================== +--- sip4-qt3-4.10.orig/siputils.py 2010-01-14 15:52:09.000000000 +0100 ++++ sip4-qt3-4.10/siputils.py 2010-01-26 21:09:49.172700039 +0100 +@@ -718,7 +718,8 @@ + + libs.extend(self.optional_list("LIBS_WINDOWS")) + +- lflags.extend(self._platform_rpaths(rpaths.as_list())) ++ # Don't append any rpaths ++ #lflags.extend(self._platform_rpaths(rpaths.as_list())) + + # Save the transformed values. + self.CFLAGS.set(cflags) +@@ -843,6 +844,15 @@ + clib is the library name in cannonical form. + framework is set of the library is implemented as a MacOS framework. + """ ++ ################################################################## ++ # Generally, the linker is intelligent enough not to need this # ++ # additional information! # ++ # And Qt4's pkg-config and prl files are broken # ++ # Changed for Debian packaging, Torsten Marek <shlomme@gmx.net> # ++ ################################################################## ++ ++ return [] ++ + prl_libs = [] + + if self.generator in ("MSVC", "MSVC.NET", "BMAKE"): diff --git a/debian/lenny/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff b/debian/lenny/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff new file mode 100644 index 000000000..a9d580737 --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff @@ -0,0 +1,18 @@ +Index: sip4-qt3-4.10/siputils.py +=================================================================== +--- sip4-qt3-4.10.orig/siputils.py 2010-01-26 23:45:34.144734105 +0100 ++++ sip4-qt3-4.10/siputils.py 2010-01-26 23:46:51.605699383 +0100 +@@ -1546,9 +1546,12 @@ + mfile.write("\n$(OFILES): $(HFILES)\n") + + for mf in self._build["tqmoc_headers"].split(): +- root, discard = os.path.splitext(mf) ++ root, _ = os.path.splitext(mf) + cpp = "tqmoc_" + root + ".cpp" + ++ if self._src_dir != self.dir: ++ mf = os.path.join(self._src_dir, mf) ++ + mfile.write("\n%s: %s\n" % (cpp, mf)) + mfile.write("\t$(TQMOC) -o %s %s\n" % (cpp, mf)) + diff --git a/debian/lenny/dependencies/sip4-tqt/debian/python-sip-dev.docs b/debian/lenny/dependencies/sip4-tqt/debian/python-sip-dev.docs new file mode 100644 index 000000000..416a453aa --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/python-sip-dev.docs @@ -0,0 +1,2 @@ +doc/html +NEWS diff --git a/debian/lenny/dependencies/sip4-tqt/debian/python-sip-dev.install b/debian/lenny/dependencies/sip4-tqt/debian/python-sip-dev.install new file mode 100644 index 000000000..1df36c612 --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/python-sip-dev.install @@ -0,0 +1 @@ +usr/bin/* diff --git a/debian/lenny/dependencies/sip4-tqt/debian/python-sip-dev.links b/debian/lenny/dependencies/sip4-tqt/debian/python-sip-dev.links new file mode 100755 index 000000000..26a9ded9b --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/python-sip-dev.links @@ -0,0 +1 @@ +usr/share/javascript/jquery/jquery.js usr/share/doc/python-sip-dev/html/_static/jquery.js diff --git a/debian/lenny/dependencies/sip4-tqt/debian/python-sip-dev.manpages b/debian/lenny/dependencies/sip4-tqt/debian/python-sip-dev.manpages new file mode 100644 index 000000000..a4e96a394 --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/python-sip-dev.manpages @@ -0,0 +1,2 @@ +debian/manpages/sip.1 +debian/manpages/dh_sip.1 diff --git a/debian/lenny/dependencies/sip4-tqt/debian/python-sip.install b/debian/lenny/dependencies/sip4-tqt/debian/python-sip.install new file mode 100644 index 000000000..f43a3a265 --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/python-sip.install @@ -0,0 +1 @@ +usr/lib/python*/*-packages/sip.so diff --git a/debian/lenny/dependencies/sip4-tqt/debian/pyversions b/debian/lenny/dependencies/sip4-tqt/debian/pyversions new file mode 100644 index 000000000..57a7586e4 --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/pyversions @@ -0,0 +1 @@ +2.3- diff --git a/debian/lenny/dependencies/sip4-tqt/debian/rules b/debian/lenny/dependencies/sip4-tqt/debian/rules new file mode 100755 index 000000000..0dd14099f --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/rules @@ -0,0 +1,148 @@ +#!/usr/bin/make -f +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DH_OPTIONS + +INSTDIR=$(CURDIR)/debian + +CFLAGS= + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 -g +else + CFLAGS += -O2 -g +endif + +PYTHONS := $(shell pyversions -vr debian/control) + +-include /usr/share/python/python.mk +ifeq (,$(py_sitename)) +py_sitename = site-packages +py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages +py_sitename_sh = $(py_sitename) +py_libdir_sh = $(py_libdir) +endif + + +.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp + +configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp) + +build-%/configure-stamp: + dh_testdir + mkdir -p build-$* + cd build-$* \ + && python$* ../configure.py \ + -d /usr/lib/python$*/$(call py_sitename,$*) \ + -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 $@ + +dbg-build-%/configure-stamp: + dh_testdir + mkdir -p dbg-build-$* + cd dbg-build-$* \ + && python$*-dbg ../configure.py \ + -d /usr/lib/python$*/$(call py_sitename,$*) \ + -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 $@ + + +build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp) + +build-%/build-stamp: build-%/configure-stamp + dh_testdir + $(MAKE) -C build-$* + touch $@ + +dbg-build-%/build-stamp: dbg-build-%/configure-stamp + dh_testdir + $(MAKE) -C dbg-build-$* + touch $@ + + +clean: + dh_testdir + dh_testroot + rm -rf *-stamp siputils.pyc $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) + dh_clean + +install-arch: build + dh_testdir + dh_testroot + dh_prep -a + dh_installdirs -a + # This is needed to enforce that the install-arch-% rules are + # not run in parallel. Both rules install into the same directory, + # and therefore might try to access the same files at the same time. + # Therefore, instead of depending on the install-arch-% rules, + # we invoke them explicitly. + for p in $(PYTHONS) ; do \ + $(MAKE) -f debian/rules install-arch-$$p;\ + done + + for i in $$(find debian/python-sip-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 {} \; + + dh_install -a --sourcedir=$(CURDIR)/debian/tmp + install -m 755 -o root -g root debian/dh_sip debian/python-sip-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 + install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-dbg/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_d.py + 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 + 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,$*) + + +# Must not depend on anything. This is to be called by +# binary-arch/binary-indep +# in another 'make' thread. +binary-common: + dh_testdir + dh_testroot + dh_installman + dh_installchangelogs + dh_installdocs -A + dh_installexamples + 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 +endif + dh_compress + dh_fixperms + dh_pysupport + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independant packages using the common target. +binary-indep: + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: install-arch + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary configure diff --git a/debian/lenny/dependencies/sip4-tqt/debian/sipconfig.py b/debian/lenny/dependencies/sip4-tqt/debian/sipconfig.py new file mode 100644 index 000000000..f23b5427a --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/sipconfig.py @@ -0,0 +1,13 @@ +# import the sipconfig.py for the normal or the debug build + +import sys + +if getattr(sys, "pydebug", False): + try: + 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' +else: + from sipconfig_nd import * + from sipconfig_nd import _pkg_config, _default_macros diff --git a/debian/lenny/dependencies/sip4-tqt/debian/source/format b/debian/lenny/dependencies/sip4-tqt/debian/source/format new file mode 100644 index 000000000..d00491fd7 --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/source/format @@ -0,0 +1 @@ +1 diff --git a/debian/lenny/dependencies/sip4-tqt/debian/watch b/debian/lenny/dependencies/sip4-tqt/debian/watch new file mode 100644 index 000000000..1ff1f0839 --- /dev/null +++ b/debian/lenny/dependencies/sip4-tqt/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://www.riverbankcomputing.co.uk/software/sip/download \ + /static/Downloads/sip4/sip-([\d\.]*)\.tar\.gz debian uupdate |