[Python-modules-commits] r11336 - in packages/sip4-qt3/trunk/debian (23 files)
shlomme at users.alioth.debian.org
shlomme at users.alioth.debian.org
Tue Jan 26 22:59:42 UTC 2010
Date: Tuesday, January 26, 2010 @ 22:59:41
Author: shlomme
Revision: 11336
Prepare for new experimental release
Added:
packages/sip4-qt3/trunk/debian/dh_sip
packages/sip4-qt3/trunk/debian/patches/series
packages/sip4-qt3/trunk/debian/patches/siputils_debian_changes.diff
packages/sip4-qt3/trunk/debian/patches/siputils_objdir_module_fix.diff
packages/sip4-qt3/trunk/debian/python-sip-dev.docs
(from rev 10682, packages/sip4-qt3/trunk/debian/sip4.docs)
packages/sip4-qt3/trunk/debian/python-sip-dev.install
(from rev 10682, packages/sip4-qt3/trunk/debian/sip4.install)
packages/sip4-qt3/trunk/debian/python-sip-dev.links
(from rev 10682, packages/sip4-qt3/trunk/debian/sip4.links)
packages/sip4-qt3/trunk/debian/python-sip-dev.manpages
(from rev 10682, packages/sip4-qt3/trunk/debian/sip4.manpages)
packages/sip4-qt3/trunk/debian/python-sip.install
(from rev 10682, packages/sip4-qt3/trunk/debian/python-sip4.install)
packages/sip4-qt3/trunk/debian/source/
packages/sip4-qt3/trunk/debian/source/format
Modified:
packages/sip4-qt3/trunk/debian/changelog
packages/sip4-qt3/trunk/debian/control
packages/sip4-qt3/trunk/debian/docs
packages/sip4-qt3/trunk/debian/rules
Deleted:
packages/sip4-qt3/trunk/debian/patches/00list
packages/sip4-qt3/trunk/debian/patches/01_configure.dpatch
packages/sip4-qt3/trunk/debian/patches/02_siputils.dpatch
packages/sip4-qt3/trunk/debian/python-sip4.install
packages/sip4-qt3/trunk/debian/sip4.docs
packages/sip4-qt3/trunk/debian/sip4.install
packages/sip4-qt3/trunk/debian/sip4.links
packages/sip4-qt3/trunk/debian/sip4.manpages
Modified: packages/sip4-qt3/trunk/debian/changelog
===================================================================
--- packages/sip4-qt3/trunk/debian/changelog 2010-01-26 21:30:56 UTC (rev 11335)
+++ packages/sip4-qt3/trunk/debian/changelog 2010-01-26 22:59:41 UTC (rev 11336)
@@ -1,12 +1,29 @@
-sip4-qt3 (4.9.3-1) UNRELEASED; urgency=low
+sip4-qt3 (4.10-1) experimental; urgency=low
* New upstream release
+ * Convert to source format "3.0 (quilt)"
+ * debian/patches/01_configure
+ - Dropped, applied upstream
+ * debian/control
+ - Renamed all packages from *sip4* to sip
+ - Added transitional packages
+ - Merged sip4 into python-sip-dev
+ - python-sip now has the public API in the provides field (Closes: #554024)
+ * debian/dh_sip
+ - Added debhelper script that generates substvars for packages
+ that directly depend on python-sip
+ * debian/rules
+ - Drop dpatch handling
+ * debian/patches/siputils_debian_changes.diff
+ - Updated to only include debian-specific patches
+ * debian/patches/siputils_objdir_module_fix.diff
+ - Fixed a bug that broke out-of-tree building of moc object files
- -- Torsten Marek <shlomme at debian.org> Mon, 23 Nov 2009 22:07:25 +0100
+ -- Torsten Marek <shlomme at debian.org> Tue, 26 Jan 2010 23:57:37 +0100
sip4-qt3 (4.9-1) unstable; urgency=high
- * New upstream release that corrects a licensing issue
+ * New upstream release that corrects a licensing issue
(Closes: #543730) (LP: #444742)
* Justificatoin of urgency=high due to licensing in testing
* debian/patches/01_configure.dpatch:
Modified: packages/sip4-qt3/trunk/debian/control
===================================================================
--- packages/sip4-qt3/trunk/debian/control 2010-01-26 21:30:56 UTC (rev 11335)
+++ packages/sip4-qt3/trunk/debian/control 2010-01-26 22:59:41 UTC (rev 11336)
@@ -3,24 +3,52 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Torsten Marek <shlomme at debian.org>, Bernd Zeimetz <bzed at debian.org>, Michael Casadevall <mcasadevall at debian.org>
-Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1), dpatch
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1)
Standards-Version: 3.8.3
Homepage: http://www.riverbankcomputing.co.uk/software/sip/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/sip4-qt3/trunk
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/sip4-qt3/trunk/
XS-Python-Version: all
-Package: sip4
+Package: python-sip
Architecture: any
-Depends: ${shlibs:Depends}, libjs-jquery
-Recommends: python-sip4-dev
-Description: Python/C++ bindings generator
+Section: python
+Provides: ${python:Provides}, sip-api-7.0
+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 it's
- specific to C++ and Python.
+ 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.
.
- WARNING: This is only the sip4 tool. If you are going to compile something
- produced by it, you will also need python-sip4-dev.
+ 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
@@ -35,36 +63,55 @@
- 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: any
+Architecture: all
Section: python
-Provides: ${python:Provides}
-Depends: ${python:Depends}, ${shlibs:Depends}
-Description: Python/C++ bindings generator runtime library
+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.
-
-Package: python-sip4-dbg
-Priority: extra
-Architecture: any
-Section: debug
-Provides: ${python:Provides}
-Depends: python-sip4 (= ${binary:Version}), python-dbg, ${shlibs:Depends}
-Description: Python/C++ bindings generator runtime library (debug extension)
+ .
+ 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 package contains the extension built for the Python debug interpreter.
+ 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:Depends}, python-dev
-Recommends: python-sip4 (>= ${source:Version})
-Description: Python/C++ bindings generator development files
+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.
Added: packages/sip4-qt3/trunk/debian/dh_sip
===================================================================
--- packages/sip4-qt3/trunk/debian/dh_sip (rev 0)
+++ packages/sip4-qt3/trunk/debian/dh_sip 2010-01-26 22:59:41 UTC (rev 11336)
@@ -0,0 +1,44 @@
+#!/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
+
+
+=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 at debian.org>
+
+=cut
Property changes on: packages/sip4-qt3/trunk/debian/dh_sip
___________________________________________________________________
Added: svn:executable
+ *
Modified: packages/sip4-qt3/trunk/debian/docs
===================================================================
--- packages/sip4-qt3/trunk/debian/docs 2010-01-26 21:30:56 UTC (rev 11335)
+++ packages/sip4-qt3/trunk/debian/docs 2010-01-26 22:59:41 UTC (rev 11336)
@@ -1,3 +1,2 @@
NEWS
README
-TODO
Deleted: packages/sip4-qt3/trunk/debian/patches/00list
===================================================================
--- packages/sip4-qt3/trunk/debian/patches/00list 2010-01-26 21:30:56 UTC (rev 11335)
+++ packages/sip4-qt3/trunk/debian/patches/00list 2010-01-26 22:59:41 UTC (rev 11336)
@@ -1,2 +0,0 @@
-01_configure
-02_siputils
Deleted: packages/sip4-qt3/trunk/debian/patches/01_configure.dpatch
===================================================================
--- packages/sip4-qt3/trunk/debian/patches/01_configure.dpatch 2010-01-26 21:30:56 UTC (rev 11335)
+++ packages/sip4-qt3/trunk/debian/patches/01_configure.dpatch 2010-01-26 22:59:41 UTC (rev 11336)
@@ -1,92 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_configure.dpatch by Torsten Marek <shlomme at debian.org>
-##
-## DP: Make it possible to do out-of-source/objectdir builds
-## DP: for sip
-
- at DPATCH@
-diff -urNad sip4-qt3-4.9~/configure.py sip4-qt3-4.9/configure.py
---- sip4-qt3-4.9~/configure.py 2009-09-26 11:14:30.000000000 -0400
-+++ sip4-qt3-4.9/configure.py 2009-10-06 13:42:29.599820891 -0400
-@@ -24,6 +24,15 @@
-
- import siputils
-
-+topsrcdir = os.path.dirname(os.path.abspath(__file__))
-+has_objdir = topsrcdir != os.path.abspath(os.path.curdir)
-+if not has_objdir:
-+ topsrcdir = None
-+
-+def srcPath(filename):
-+ if topsrcdir is not None:
-+ return os.path.join(topsrcdir, filename)
-+ return filename
-
- # Initialise the globals.
- sip_version = 0x040900
-@@ -248,8 +257,11 @@
- macros is the dictionary of platform specific build macros.
- """
- # Bootstrap.
-+ # make sure to load the currect sipconfig
-+ # from our directory
-+ sys.path.insert(0, os.path.curdir)
- import sipconfig
--
-+
- cfg = sipconfig.Configuration()
-
- cfg.set_build_macros(macros)
-@@ -259,7 +271,8 @@
- sipconfig.ParentMakefile(
- configuration=cfg,
- subdirs=["sipgen", "siplib"],
-- installs=(["sipconfig.py", "sipdistutils.py"], cfg.sip_mod_dir)
-+ installs=(["sipconfig.py", srcPath("sipdistutils.py")], cfg.sip_mod_dir),
-+ has_objdir=has_objdir
- ).generate()
-
- sipconfig.inform("Creating sip code generator Makefile...")
-@@ -271,6 +284,7 @@
- install_dir=os.path.dirname(cfg.sip_bin),
- console=1,
- warnings=0,
-+ topsrcdir=topsrcdir,
- universal=opts.universal,
- arch=opts.arch
- ).generate()
-@@ -287,6 +301,7 @@
- warnings=0,
- static=opts.static,
- debug=opts.debug,
-+ topsrcdir=topsrcdir,
- universal=opts.universal,
- arch=opts.arch
- )
-@@ -384,7 +399,7 @@
- set_platform_directories()
-
- # Build up the list of valid specs.
-- for s in os.listdir("specs"):
-+ for s in os.listdir(srcPath("specs")):
- platform_specs.append(s)
-
- # Parse the command line.
-@@ -433,7 +448,7 @@
- opts.universal = ''
-
- # Get the platform specific macros for building.
-- macros = siputils.parse_build_macros(os.path.join("specs", opts.platform),
-+ macros = siputils.parse_build_macros(srcPath(os.path.join("specs", opts.platform)),
- build_macro_names, args)
-
- if macros is None:
-@@ -444,7 +459,7 @@
- inform_user()
-
- # Install the configuration module.
-- create_config("sipconfig.py", "siputils.py", macros)
-+ create_config("sipconfig.py", srcPath("siputils.py"), macros)
-
- # Create the Makefiles.
- create_makefiles(macros)
Deleted: packages/sip4-qt3/trunk/debian/patches/02_siputils.dpatch
===================================================================
--- packages/sip4-qt3/trunk/debian/patches/02_siputils.dpatch 2010-01-26 21:30:56 UTC (rev 11335)
+++ packages/sip4-qt3/trunk/debian/patches/02_siputils.dpatch 2010-01-26 22:59:41 UTC (rev 11336)
@@ -1,193 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_siputils.dpatch by Torsten Marek <shlomme at debian.org>
-##
-## DP: Patch for siputils.py adding objectdir support
-
- at DPATCH@
-diff -urNad sip4-qt3-4.9~/siputils.py sip4-qt3-4.9/siputils.py
---- sip4-qt3-4.9~/siputils.py 2009-09-26 11:14:30.000000000 -0400
-+++ sip4-qt3-4.9/siputils.py 2009-10-06 14:12:44.668507206 -0400
-@@ -203,7 +203,7 @@
- def __init__(self, configuration, console=0, qt=0, opengl=0, python=0,
- threaded=0, warnings=1, debug=0, dir=None,
- makefile="Makefile", installs=None, universal=None,
-- arch=None):
-+ topsrcdir=None, arch=None):
- """Initialise an instance of the target. All the macros are left
- unchanged allowing scripts to manipulate them at will.
-
-@@ -253,7 +253,14 @@
- self._python = python
- self._warnings = warnings
- self._debug = debug
-- self._dir = dir
-+ if topsrcdir is not None:
-+ self._dir = os.path.join(topsrcdir, dir)
-+ self._objdir = dir
-+ self._has_objdir = True
-+ else:
-+ self._dir = dir
-+ self._has_objdir = False
-+
- self._makefile = makefile
- self._installs = installs
-
-@@ -323,6 +330,13 @@
- self.chkdir = self.optional_string("CHK_DIR_EXISTS", def_chk_dir_exists)
-
-
-+ def srcPath(self, path):
-+ if self._has_objdir:
-+ return os.path.join(self._dir, path)
-+ else:
-+ return path
-+
-+
- def finalise(self):
- """Finalise the macros by doing any consolidation that isn't specific
- to a Makefile.
-@@ -801,6 +815,10 @@
-
- rpaths is the cannonical list of rpaths.
- """
-+ # Do not use any rpaths on Debian
-+ # Changed by Torsten Marek <shlomme at gmx.net>
-+ return []
-+
- flags = []
- prefix = self.optional_string("RPATH")
-
-@@ -832,6 +850,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 at gmx.net> #
-+ ##################################################################
-+
-+ return []
-+
- prl_libs = []
-
- if self.generator in ("MSVC", "MSVC.NET", "BMAKE"):
-@@ -969,7 +996,10 @@
- self.ready()
-
- if self._dir:
-- mfname = os.path.join(self._dir, self._makefile)
-+ if self._has_objdir:
-+ mfname = os.path.join(self._objdir, self._makefile)
-+ else:
-+ mfname = os.path.join(self._dir, self._makefile)
- else:
- mfname = self._makefile
-
-@@ -987,6 +1017,8 @@
- self._installs = [self._installs]
-
- for src, dst in self._installs:
-+ if self._dir is not None and self._has_objdir:
-+ src = [os.path.join(self._dir, sf) for sf in src]
- self.install_file(mfile, src, dst)
-
- self.generate_target_clean(mfile)
-@@ -1049,6 +1081,9 @@
- else:
- mfile.write(".SUFFIXES: .c .cpp .cc .cxx .C\n\n")
-
-+ if self._has_objdir:
-+ mfile.write("VPATH = %s\n\n" % (self._dir))
-+
- if self.generator in ("MSVC", "MSVC.NET"):
- mfile.write("""
- {.}.cpp{}.obj::
-@@ -1175,14 +1210,14 @@
- """The class that represents a parent Makefile.
- """
- def __init__(self, configuration, subdirs, dir=None, makefile="Makefile",
-- installs=None):
-+ installs=None, has_objdir=False):
- """Initialise an instance of a parent Makefile.
-
- subdirs is the sequence of subdirectories.
- """
- Makefile.__init__(self, configuration, dir=dir, makefile=makefile, installs=installs)
--
- self._subdirs = subdirs
-+ self._has_objdir = has_objdir
-
- def generate_macros_and_rules(self, mfile):
- """Generate the macros and rules.
-@@ -1227,6 +1262,12 @@
- mfile.write("\n" + target + ":\n")
-
- for d in self._subdirs:
-+ if self._has_objdir:
-+ try:
-+ os.mkdir(d)
-+ except OSError, e:
-+ if e.errno != 17:
-+ raise e
- if self.generator == "MINGW":
- mfile.write("\t@$(MAKE) -C %s%s\n" % (d, tname))
- elif self.generator == "UNIX":
-@@ -1303,7 +1344,7 @@
- def __init__(self, configuration, build_file, install_dir=None, static=0,
- console=0, qt=0, opengl=0, threaded=0, warnings=1, debug=0,
- dir=None, makefile="Makefile", installs=None, strip=1,
-- export_all=0, universal=None, arch=None):
-+ export_all=0, topsrcdir=None, universal=None, arch=None):
- """Initialise an instance of a module Makefile.
-
- build_file is the file containing the target specific information. If
-@@ -1317,11 +1358,10 @@
- increases the size of the module and slows down module load times but
- may avoid problems with modules that use exceptions. The default is 0.
- """
-- Makefile.__init__(self, configuration, console, qt, opengl, 1, threaded, warnings, debug, dir, makefile, installs, universal, arch)
-+ Makefile.__init__(self, configuration, console, qt, opengl, 1, threaded, warnings, debug, dir, makefile, installs, universal, topsrcdir, arch)
-
- self._build = self.parse_build_file(build_file)
- self._install_dir = install_dir
-- self._dir = dir
- self.static = static
-
- self._manifest = ("embed_manifest_dll" in self.optional_list("CONFIG"))
-@@ -1522,7 +1562,7 @@
- cpp = "moc_" + root + ".cpp"
-
- mfile.write("\n%s: %s\n" % (cpp, mf))
-- mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
-+ mfile.write("\t$(MOC) -o %s %s\n" % (cpp, self.srcPath(mf)))
-
- mfile.write("\n$(TARGET): $(OFILES)\n")
-
-@@ -1634,14 +1674,14 @@
- def __init__(self, configuration, build_file=None, install_dir=None,
- console=0, qt=0, opengl=0, python=0, threaded=0, warnings=1,
- debug=0, dir=None, makefile="Makefile", installs=None,
-- universal=None, arch=None):
-+ topsrcdir=None, universal=None, arch=None):
- """Initialise an instance of a program Makefile.
-
- build_file is the file containing the target specific information. If
- it is a dictionary instead then its contents are validated.
- install_dir is the directory the target will be installed in.
- """
-- Makefile.__init__(self, configuration, console, qt, opengl, python, threaded, warnings, debug, dir, makefile, installs, universal, arch)
-+ Makefile.__init__(self, configuration, console, qt, opengl, python, threaded, warnings, debug, dir, makefile, installs, universal, topsrcdir, arch)
-
- self._install_dir = install_dir
-
-@@ -1792,7 +1832,7 @@
- cpp = "moc_" + root + ".cpp"
-
- mfile.write("\n%s: %s\n" % (cpp, mf))
-- mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
-+ mfile.write("\t$(MOC) -o %s %s\n" % (cpp, self.srcPath(mf)))
-
- mfile.write("\n$(TARGET): $(OFILES)\n")
-
Added: packages/sip4-qt3/trunk/debian/patches/series
===================================================================
--- packages/sip4-qt3/trunk/debian/patches/series (rev 0)
+++ packages/sip4-qt3/trunk/debian/patches/series 2010-01-26 22:59:41 UTC (rev 11336)
@@ -0,0 +1,2 @@
+siputils_debian_changes.diff
+siputils_objdir_module_fix.diff
Added: packages/sip4-qt3/trunk/debian/patches/siputils_debian_changes.diff
===================================================================
--- packages/sip4-qt3/trunk/debian/patches/siputils_debian_changes.diff (rev 0)
+++ packages/sip4-qt3/trunk/debian/patches/siputils_debian_changes.diff 2010-01-26 22:59:41 UTC (rev 11336)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_siputils.dpatch by Torsten Marek <shlomme at 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 at gmx.net> #
++ ##################################################################
++
++ return []
++
+ prl_libs = []
+
+ if self.generator in ("MSVC", "MSVC.NET", "BMAKE"):
Added: packages/sip4-qt3/trunk/debian/patches/siputils_objdir_module_fix.diff
===================================================================
--- packages/sip4-qt3/trunk/debian/patches/siputils_objdir_module_fix.diff (rev 0)
+++ packages/sip4-qt3/trunk/debian/patches/siputils_objdir_module_fix.diff 2010-01-26 22:59:41 UTC (rev 11336)
@@ -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["moc_headers"].split():
+- root, discard = os.path.splitext(mf)
++ root, _ = os.path.splitext(mf)
+ cpp = "moc_" + 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$(MOC) -o %s %s\n" % (cpp, mf))
+
Copied: packages/sip4-qt3/trunk/debian/python-sip-dev.docs (from rev 10682, packages/sip4-qt3/trunk/debian/sip4.docs)
===================================================================
--- packages/sip4-qt3/trunk/debian/python-sip-dev.docs (rev 0)
+++ packages/sip4-qt3/trunk/debian/python-sip-dev.docs 2010-01-26 22:59:41 UTC (rev 11336)
@@ -0,0 +1,2 @@
+doc/html
+NEWS
Copied: packages/sip4-qt3/trunk/debian/python-sip-dev.install (from rev 10682, packages/sip4-qt3/trunk/debian/sip4.install)
===================================================================
--- packages/sip4-qt3/trunk/debian/python-sip-dev.install (rev 0)
+++ packages/sip4-qt3/trunk/debian/python-sip-dev.install 2010-01-26 22:59:41 UTC (rev 11336)
@@ -0,0 +1 @@
+usr/bin/*
Copied: packages/sip4-qt3/trunk/debian/python-sip-dev.links (from rev 10682, packages/sip4-qt3/trunk/debian/sip4.links)
===================================================================
--- packages/sip4-qt3/trunk/debian/python-sip-dev.links (rev 0)
+++ packages/sip4-qt3/trunk/debian/python-sip-dev.links 2010-01-26 22:59:41 UTC (rev 11336)
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/python-sip-dev/html/_static/jquery.js
Copied: packages/sip4-qt3/trunk/debian/python-sip-dev.manpages (from rev 10682, packages/sip4-qt3/trunk/debian/sip4.manpages)
===================================================================
--- packages/sip4-qt3/trunk/debian/python-sip-dev.manpages (rev 0)
+++ packages/sip4-qt3/trunk/debian/python-sip-dev.manpages 2010-01-26 22:59:41 UTC (rev 11336)
@@ -0,0 +1 @@
+debian/manpages/sip.1
Copied: packages/sip4-qt3/trunk/debian/python-sip.install (from rev 10682, packages/sip4-qt3/trunk/debian/python-sip4.install)
===================================================================
--- packages/sip4-qt3/trunk/debian/python-sip.install (rev 0)
+++ packages/sip4-qt3/trunk/debian/python-sip.install 2010-01-26 22:59:41 UTC (rev 11336)
@@ -0,0 +1 @@
+usr/lib/python*/*-packages/sip.so
Deleted: packages/sip4-qt3/trunk/debian/python-sip4.install
===================================================================
--- packages/sip4-qt3/trunk/debian/python-sip4.install 2010-01-26 21:30:56 UTC (rev 11335)
+++ packages/sip4-qt3/trunk/debian/python-sip4.install 2010-01-26 22:59:41 UTC (rev 11336)
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/sip.so
Modified: packages/sip4-qt3/trunk/debian/rules
===================================================================
--- packages/sip4-qt3/trunk/debian/rules 2010-01-26 21:30:56 UTC (rev 11335)
+++ packages/sip4-qt3/trunk/debian/rules 2010-01-26 22:59:41 UTC (rev 11336)
@@ -4,8 +4,6 @@
export DH_OPTIONS
-include /usr/share/dpatch/dpatch.make
-
INSTDIR=$(CURDIR)/debian
CFLAGS=
@@ -31,7 +29,7 @@
configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
-build-%/configure-stamp: patch-stamp
+build-%/configure-stamp:
dh_testdir
mkdir -p build-$*
cd build-$* \
@@ -40,7 +38,7 @@
-u STRIP="" CFLAGS="${CFLAGS}" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS}" CXXFLAGS_RELEASE=""
touch $@
-dbg-build-%/configure-stamp: patch-stamp
+dbg-build-%/configure-stamp:
dh_testdir
mkdir -p dbg-build-$*
cd dbg-build-$* \
@@ -64,30 +62,12 @@
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -rf *-stamp siputils.pyc $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
dh_clean
-install-indep-pre: configure
- dh_testdir
- dh_testroot
- dh_clean -i
- dh_installdirs -i
-
-install-indep-%: install-indep-pre
- mkdir -p debian/python-sip4-dev/usr/include/python$*
- install -m 644 -o root -g root siplib/sip.h debian/python-sip4-dev/usr/include/python$*/
- mkdir -p debian/python-sip4-dev/usr/include/python$*_d
- ln -s ../python$*/sip.h \
- debian/python-sip4-dev/usr/include/python$*_d/sip.h
- mkdir -p debian/python-sip4-dev/usr/lib/python$*/$(call py_sitename,$*)
- install -m 644 -o root -g root sipdistutils.py debian/python-sip4-dev/usr/lib/python$*/$(call py_sitename,$*)
-
-install-indep: $(PYTHONS:%=install-indep-%)
- dh_install -i
-
install-arch: build
dh_testdir
dh_testroot
@@ -102,23 +82,32 @@
$(MAKE) -f debian/rules install-arch-$$p;\
done
- for i in $$(find debian/python-sip4-dbg -name '*.so'); do \
+ 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-sip4-dbg ! -type d ! -name '*_d.*' | xargs rm -f
- find debian/python-sip4-dbg -depth -empty -exec rmdir {} \;
+ 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-sip4-dbg
- mkdir -p debian/python-sip4/usr/lib/python$*/$(call py_sitename,$*)/
- install -m 644 -o root -g root debian/sipconfig.py debian/python-sip4/usr/lib/python$*/$(call py_sitename,$*)/
- install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip4/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_nd.py
- install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip4-dbg/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_d.py
+ $(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.
@@ -132,11 +121,11 @@
dh_link
# don't call strip twice, it's in binary-common
ifneq (,$(findstring -a, $(DH_OPTIONS)))
- DH_OPTIONS= dh_strip -psip4
- DH_OPTIONS= dh_strip -ppython-sip4 -Nsip4 --dbg-package=python-sip4-dbg
- rm -rf debian/python-sip4-dbg/usr/share/doc/python-sip4-dbg
- mkdir -p debian/python-sip4-dbg/usr/share/doc
- ln -s python-sip4 debian/python-sip4-dbg/usr/share/doc/python-sip4-dbg
+ 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
@@ -148,12 +137,12 @@
dh_builddeb
# Build architecture independant packages using the common target.
-binary-indep: install-indep
+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-indep binary-arch
+binary: binary-arch binary-indep
.PHONY: build clean binary-indep binary-arch binary configure
Deleted: packages/sip4-qt3/trunk/debian/sip4.docs
===================================================================
--- packages/sip4-qt3/trunk/debian/sip4.docs 2010-01-26 21:30:56 UTC (rev 11335)
+++ packages/sip4-qt3/trunk/debian/sip4.docs 2010-01-26 22:59:41 UTC (rev 11336)
@@ -1,2 +0,0 @@
-doc/html
-NEWS
Deleted: packages/sip4-qt3/trunk/debian/sip4.install
===================================================================
--- packages/sip4-qt3/trunk/debian/sip4.install 2010-01-26 21:30:56 UTC (rev 11335)
+++ packages/sip4-qt3/trunk/debian/sip4.install 2010-01-26 22:59:41 UTC (rev 11336)
@@ -1 +0,0 @@
-usr/bin/*
Deleted: packages/sip4-qt3/trunk/debian/sip4.links
===================================================================
--- packages/sip4-qt3/trunk/debian/sip4.links 2010-01-26 21:30:56 UTC (rev 11335)
+++ packages/sip4-qt3/trunk/debian/sip4.links 2010-01-26 22:59:41 UTC (rev 11336)
@@ -1 +0,0 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/sip4/html/_static/jquery.js
Deleted: packages/sip4-qt3/trunk/debian/sip4.manpages
===================================================================
--- packages/sip4-qt3/trunk/debian/sip4.manpages 2010-01-26 21:30:56 UTC (rev 11335)
+++ packages/sip4-qt3/trunk/debian/sip4.manpages 2010-01-26 22:59:41 UTC (rev 11336)
@@ -1 +0,0 @@
-debian/manpages/sip.1
Added: packages/sip4-qt3/trunk/debian/source/format
===================================================================
--- packages/sip4-qt3/trunk/debian/source/format (rev 0)
+++ packages/sip4-qt3/trunk/debian/source/format 2010-01-26 22:59:41 UTC (rev 11336)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Python-modules-commits
mailing list