[Python-modules-commits] r9958 - in packages/sip4-qt3/trunk/debian (3 files)
ncommander-guest at users.alioth.debian.org
ncommander-guest at users.alioth.debian.org
Tue Oct 6 18:14:25 UTC 2009
Date: Tuesday, October 6, 2009 @ 18:14:24
Author: ncommander-guest
Revision: 9958
* 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:
- Refreshed for new source version
* debian/patches/02_siputils.dpatch:
- Refreshed for new source version
Modified:
packages/sip4-qt3/trunk/debian/changelog
packages/sip4-qt3/trunk/debian/patches/01_configure.dpatch
packages/sip4-qt3/trunk/debian/patches/02_siputils.dpatch
Modified: packages/sip4-qt3/trunk/debian/changelog
===================================================================
--- packages/sip4-qt3/trunk/debian/changelog 2009-10-06 18:01:44 UTC (rev 9957)
+++ packages/sip4-qt3/trunk/debian/changelog 2009-10-06 18:14:24 UTC (rev 9958)
@@ -1,6 +1,12 @@
-sip4-qt3 (4.9-1) UNRELEASED; urgency=low
+sip4-qt3 (4.9-1) UNRELEASED; urgency=high
- * New upstream release that corrects a licensing issue (Closes: #543730)
+ * 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:
+ - Refreshed for new source version
+ * debian/patches/02_siputils.dpatch:
+ - Refreshed for new source version
-- Michael Casadevall <mcasadevall at debian.org> Tue, 06 Oct 2009 13:26:13 -0400
Modified: packages/sip4-qt3/trunk/debian/patches/01_configure.dpatch
===================================================================
--- packages/sip4-qt3/trunk/debian/patches/01_configure.dpatch 2009-10-06 18:01:44 UTC (rev 9957)
+++ packages/sip4-qt3/trunk/debian/patches/01_configure.dpatch 2009-10-06 18:14:24 UTC (rev 9958)
@@ -5,10 +5,10 @@
## DP: for sip
@DPATCH@
-diff -urNad sip4-qt3-4.8~/configure.py sip4-qt3-4.8/configure.py
---- sip4-qt3-4.8~/configure.py 2009-06-05 10:59:07.000000000 +0200
-+++ sip4-qt3-4.8/configure.py 2009-06-06 20:21:45.000000000 +0200
-@@ -19,6 +19,15 @@
+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
@@ -23,8 +23,8 @@
+ return filename
# Initialise the globals.
- sip_version = 0x040800
-@@ -238,8 +247,11 @@
+ sip_version = 0x040900
+@@ -248,8 +257,11 @@
macros is the dictionary of platform specific build macros.
"""
# Bootstrap.
@@ -37,7 +37,7 @@
cfg = sipconfig.Configuration()
cfg.set_build_macros(macros)
-@@ -249,7 +261,8 @@
+@@ -259,7 +271,8 @@
sipconfig.ParentMakefile(
configuration=cfg,
subdirs=["sipgen", "siplib"],
@@ -47,23 +47,23 @@
).generate()
sipconfig.inform("Creating sip code generator Makefile...")
-@@ -261,6 +274,7 @@
+@@ -271,6 +284,7 @@
install_dir=os.path.dirname(cfg.sip_bin),
console=1,
warnings=0,
+ topsrcdir=topsrcdir,
- universal=opts.universal
+ universal=opts.universal,
+ arch=opts.arch
).generate()
-
-@@ -276,6 +290,7 @@
+@@ -287,6 +301,7 @@
warnings=0,
static=opts.static,
debug=opts.debug,
-+ topsrcdir=topsrcdir,
- universal=opts.universal
++ topsrcdir=topsrcdir,
+ universal=opts.universal,
+ arch=opts.arch
)
-
-@@ -356,7 +371,7 @@
+@@ -384,7 +399,7 @@
set_platform_directories()
# Build up the list of valid specs.
@@ -72,7 +72,7 @@
platform_specs.append(s)
# Parse the command line.
-@@ -389,7 +404,7 @@
+@@ -433,7 +448,7 @@
opts.universal = ''
# Get the platform specific macros for building.
@@ -81,7 +81,7 @@
build_macro_names, args)
if macros is None:
-@@ -400,7 +415,7 @@
+@@ -444,7 +459,7 @@
inform_user()
# Install the configuration module.
Modified: packages/sip4-qt3/trunk/debian/patches/02_siputils.dpatch
===================================================================
--- packages/sip4-qt3/trunk/debian/patches/02_siputils.dpatch 2009-10-06 18:01:44 UTC (rev 9957)
+++ packages/sip4-qt3/trunk/debian/patches/02_siputils.dpatch 2009-10-06 18:14:24 UTC (rev 9958)
@@ -4,19 +4,19 @@
## DP: Patch for siputils.py adding objectdir support
@DPATCH@
-diff -urNad sip4-qt3-4.6~/siputils.py sip4-qt3-4.6/siputils.py
---- sip4-qt3-4.6~/siputils.py 2007-04-10 16:27:33.000000000 +0200
-+++ sip4-qt3-4.6/siputils.py 2007-05-07 21:40:45.000000000 +0200
-@@ -188,7 +188,7 @@
- """
+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=''):
-+ makefile="Makefile", installs=None, topsrcdir=None, universal=''):
+ 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.
-@@ -239,7 +239,14 @@
+@@ -253,7 +253,14 @@
self._python = python
self._warnings = warnings
self._debug = debug
@@ -31,8 +31,8 @@
+
self._makefile = makefile
self._installs = installs
- self._universal = universal
-@@ -300,6 +307,13 @@
+
+@@ -323,6 +330,13 @@
self.chkdir = self.optional_string("CHK_DIR_EXISTS", def_chk_dir_exists)
@@ -46,7 +46,7 @@
def finalise(self):
"""Finalise the macros by doing any consolidation that isn't specific
to a Makefile.
-@@ -736,6 +750,10 @@
+@@ -801,6 +815,10 @@
rpaths is the cannonical list of rpaths.
"""
@@ -57,7 +57,7 @@
flags = []
prefix = self.optional_string("RPATH")
-@@ -767,6 +785,15 @@
+@@ -832,6 +850,15 @@
clib is the library name in cannonical form.
framework is set of the library is implemented as a MacOS framework.
"""
@@ -73,7 +73,7 @@
prl_libs = []
if self.generator in ("MSVC", "MSVC.NET", "BMAKE"):
-@@ -904,7 +931,10 @@
+@@ -969,7 +996,10 @@
self.ready()
if self._dir:
@@ -85,7 +85,7 @@
else:
mfname = self._makefile
-@@ -922,6 +952,8 @@
+@@ -987,6 +1017,8 @@
self._installs = [self._installs]
for src, dst in self._installs:
@@ -94,7 +94,7 @@
self.install_file(mfile, src, dst)
self.generate_target_clean(mfile)
-@@ -981,6 +1013,9 @@
+@@ -1049,6 +1081,9 @@
else:
mfile.write(".SUFFIXES: .c .cpp .cc .cxx .C\n\n")
@@ -104,7 +104,7 @@
if self.generator in ("MSVC", "MSVC.NET"):
mfile.write("""
{.}.cpp{}.obj::
-@@ -1107,14 +1142,14 @@
+@@ -1175,14 +1210,14 @@
"""The class that represents a parent Makefile.
"""
def __init__(self, configuration, subdirs, dir=None, makefile="Makefile",
@@ -121,7 +121,7 @@
def generate_macros_and_rules(self, mfile):
"""Generate the macros and rules.
-@@ -1159,6 +1194,12 @@
+@@ -1227,6 +1262,12 @@
mfile.write("\n" + target + ":\n")
for d in self._subdirs:
@@ -134,60 +134,60 @@
if self.generator == "MINGW":
mfile.write("\t@$(MAKE) -C %s%s\n" % (d, tname))
elif self.generator == "UNIX":
-@@ -1239,7 +1280,7 @@
+@@ -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=''):
-+ export_all=0, topsrcdir=None, universal=''):
+- 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
-@@ -1253,11 +1294,10 @@
+@@ -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)
-+ Makefile.__init__(self, configuration, console, qt, opengl, 1, threaded, warnings, debug, dir, makefile, installs, topsrcdir, universal)
+- 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
- # Don't strip or restrict the exports if this is a debug or static
-@@ -1512,7 +1552,7 @@
+ 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)))
- def generate_target_install(self, mfile):
- """Generate the install target.
-@@ -1557,14 +1597,14 @@
+ 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=''):
-+ topsrcdir=None, universal=''):
+- 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)
-+ Makefile.__init__(self, configuration, console, qt, opengl, python, threaded, warnings, debug, dir, makefile, installs, topsrcdir, universal)
+- 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
-@@ -1717,7 +1757,7 @@
+@@ -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)))
- def generate_target_install(self, mfile):
- """Generate the install target.
+ mfile.write("\n$(TARGET): $(OFILES)\n")
+
More information about the Python-modules-commits
mailing list