DEB sip4-tqt: Update packaging after renaming binaries to sip-tqt.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

21 files changed, 108 insertions, 120 deletions

diff --git a/debian/_base/dependencies/sip4-tqt/debian/manpages/sip.1 b/debian/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1
index ce178cc7e..ef824974f 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/manpages/sip.1
+++ b/debian/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1
@@ -1,26 +1,26 @@
 .\"
 .\" Created by Ricardo Cárdenes Medina <ricardo@conysis.com>
-.\" for the Debian 'sip' package
+.\" for the Debian 'sip-tqt' package
 .\"
-.TH SIP 1 "2010/02/02"
+.TH SIP-TQT 1 "2010/02/02"
 .SH NAME
-sip \- generates C++/Python bindings
+sip-tqt \- generates C++/Python bindings
 .SH SYNOPSIS
-.B sip
+.B sip-tqt
 [\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
+.B sip-tqt
 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.
+sip-tqt 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
+Display the sip-tqt version number
 .TP
 .B \-a file
 The name of the QScintilla API file. If not indicated, it will not
@@ -43,7 +43,7 @@ Enable support for exceptions. Disabled by default.
 Always release and reaquire the GIL.
 .TP
 .B -I dir
-Directory where sip can search for included files.
+Directory where sip-tqt can search for included files.
 .TP
 .B -j number
 Splits the generated code in \fInumber\fR files (1 by default). This
@@ -66,7 +66,7 @@ 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
+defined with a %Timeline directive. If you don't specify one, sip-tqt
 will generate the latest available.
 .TP
 .B -w
@@ -80,7 +80,7 @@ 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.
+sip-tqt 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/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages b/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
index ba33bb512..b3b0eafea 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
+++ b/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
@@ -1,2 +1,2 @@
-debian/manpages/sip.1
+debian/manpages/sip-tqt.1
 debian/manpages/dh_sip_tqt.1
diff --git a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install b/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
index 9639c2814..bfa1b37f6 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
+++ b/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/sip4_tqt/sip.so
+usr/lib/python*/*-packages/sip_tqt.so
diff --git a/debian/_base/dependencies/sip4-tqt/debian/rules b/debian/_base/dependencies/sip4-tqt/debian/rules
index 1feb9c154..1b07c97d2 100755
--- a/debian/_base/dependencies/sip4-tqt/debian/rules
+++ b/debian/_base/dependencies/sip4-tqt/debian/rules
@@ -47,7 +47,7 @@ build-%/configure-stamp:
 	mkdir -p build-$*
 	cd build-$* \
 		&& python$* ../configure.py \
-			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
+			-d /usr/lib/python$*/$(call py_sitename,$*) \
 			-g python$* \
 			-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 $@
@@ -57,7 +57,7 @@ dbg-build-%/configure-stamp:
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* \
 		&& python$*-dbg ../configure.py \
-			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
+			-d /usr/lib/python$*/$(call py_sitename,$*) \
 			-g python$* \
 			-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=""
@@ -110,18 +110,17 @@ install-arch: build
 install-arch-%:
 	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
 	$(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
-	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
+	mkdir -p debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/
+	install -m 644 -o root -g root debian/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config.py
+	install -m 644 -o root -g root build-$*/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_nd.py
+	install -m 644 -o root -g root dbg-build-$*/sip_tqt_config.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_d.py
 	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$*/
+	install -m 644 -o root -g root siplib/sip-tqt.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-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
+	ln -s ../python$*/sip-tqt.h \
+	    debian/python-sip-tqt-dev/usr/include/python$*_d/sip-tqt.h
+	mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
+	install -m 644 -o root -g root sip_tqt_distutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
 
 
 # Must not depend on anything. This is to be called by
diff --git a/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py b/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py
new file mode 100644
index 000000000..33ebcb65b
--- /dev/null
+++ b/debian/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py
@@ -0,0 +1,13 @@
+# import the sip_tqt_config.py for the normal or the debug build
+
+import sys
+
+if getattr(sys, "pydebug", False):
+    try:
+        from sip_tqt_config_d import *
+        from sip_tqt_config_d import _pkg_config, _default_macros
+    except ImportError, msg:
+        raise ImportError, 'No module named sip_config; package python-sip-tqt-dbg not installed'
+else:
+    from sip_tqt_config_nd import *
+    from sip_tqt_config_nd import _pkg_config, _default_macros
diff --git a/debian/_base/dependencies/sip4-tqt/debian/sipconfig.py b/debian/_base/dependencies/sip4-tqt/debian/sipconfig.py
deleted file mode 100644
index a9e761f08..000000000
--- a/debian/_base/dependencies/sip4-tqt/debian/sipconfig.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-sip-tqt-dbg not installed'
-else:
-    from sipconfig_nd import *
-    from sipconfig_nd import _pkg_config, _default_macros
diff --git a/debian/_base/dependencies/sip4-tqt/debian/watch b/debian/_base/dependencies/sip4-tqt/debian/watch
deleted file mode 100644
index 1ff1f0839..000000000
--- a/debian/_base/dependencies/sip4-tqt/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.riverbankcomputing.co.uk/software/sip/download \
-      /static/Downloads/sip4/sip-([\d\.]*)\.tar\.gz debian uupdate
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip.1 b/dilos/dependencies/sip4-tqt/debian/manpages/sip-tqt.1
index ce178cc7e..ef824974f 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip.1
+++ b/dilos/dependencies/sip4-tqt/debian/manpages/sip-tqt.1
@@ -1,26 +1,26 @@
 .\"
 .\" Created by Ricardo Cárdenes Medina <ricardo@conysis.com>
-.\" for the Debian 'sip' package
+.\" for the Debian 'sip-tqt' package
 .\"
-.TH SIP 1 "2010/02/02"
+.TH SIP-TQT 1 "2010/02/02"
 .SH NAME
-sip \- generates C++/Python bindings
+sip-tqt \- generates C++/Python bindings
 .SH SYNOPSIS
-.B sip
+.B sip-tqt
 [\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
+.B sip-tqt
 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.
+sip-tqt 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
+Display the sip-tqt version number
 .TP
 .B \-a file
 The name of the QScintilla API file. If not indicated, it will not
@@ -43,7 +43,7 @@ Enable support for exceptions. Disabled by default.
 Always release and reaquire the GIL.
 .TP
 .B -I dir
-Directory where sip can search for included files.
+Directory where sip-tqt can search for included files.
 .TP
 .B -j number
 Splits the generated code in \fInumber\fR files (1 by default). This
@@ -66,7 +66,7 @@ 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
+defined with a %Timeline directive. If you don't specify one, sip-tqt
 will generate the latest available.
 .TP
 .B -w
@@ -80,7 +80,7 @@ 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.
+sip-tqt 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/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
index ba33bb512..b3b0eafea 100644
--- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
+++ b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
@@ -1,2 +1,2 @@
-debian/manpages/sip.1
+debian/manpages/sip-tqt.1
 debian/manpages/dh_sip_tqt.1
diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install
index 9639c2814..bfa1b37f6 100644
--- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install
+++ b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/sip4_tqt/sip.so
+usr/lib/python*/*-packages/sip_tqt.so
diff --git a/dilos/dependencies/sip4-tqt/debian/rules b/dilos/dependencies/sip4-tqt/debian/rules
index 9fd544a5a..23fe587f0 100755
--- a/dilos/dependencies/sip4-tqt/debian/rules
+++ b/dilos/dependencies/sip4-tqt/debian/rules
@@ -48,7 +48,7 @@ build-%/configure-stamp:
 	mkdir -p build-$*
 	cd build-$* \
 		&& python$* ../configure.py \
-			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
+			-d /usr/lib/python$*/$(call py_sitename,$*) \
 			-g python$* \
 			-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="" \
 			-p solaris-g++
@@ -59,7 +59,7 @@ dbg-build-%/configure-stamp:
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* \
 		&& python$*-dbg ../configure.py \
-			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
+			-d /usr/lib/python$*/$(call py_sitename,$*) \
 			-g python$* \
 			-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=""
@@ -114,18 +114,17 @@ install-arch: build
 install-arch-%:
 	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
 #	$(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
-#	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
+	mkdir -p debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/
+	install -m 644 -o root -g root debian/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config.py
+	install -m 644 -o root -g root build-$*/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_nd.py
+#	install -m 644 -o root -g root dbg-build-$*/sip_tqt_config.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_d.py
 	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$*/
+	install -m 644 -o root -g root siplib/sip-tqt.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-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
+	ln -s ../python$*/sip-tqt.h \
+	    debian/python-sip-tqt-dev/usr/include/python$*_d/sip-tqt.h
+	mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
+	install -m 644 -o root -g root sip_tqt_distutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
 
 
 # Must not depend on anything. This is to be called by
diff --git a/dilos/dependencies/sip4-tqt/debian/sip_tqt_config.py b/dilos/dependencies/sip4-tqt/debian/sip_tqt_config.py
new file mode 100644
index 000000000..33ebcb65b
--- /dev/null
+++ b/dilos/dependencies/sip4-tqt/debian/sip_tqt_config.py
@@ -0,0 +1,13 @@
+# import the sip_tqt_config.py for the normal or the debug build
+
+import sys
+
+if getattr(sys, "pydebug", False):
+    try:
+        from sip_tqt_config_d import *
+        from sip_tqt_config_d import _pkg_config, _default_macros
+    except ImportError, msg:
+        raise ImportError, 'No module named sip_config; package python-sip-tqt-dbg not installed'
+else:
+    from sip_tqt_config_nd import *
+    from sip_tqt_config_nd import _pkg_config, _default_macros
diff --git a/dilos/dependencies/sip4-tqt/debian/sipconfig.py b/dilos/dependencies/sip4-tqt/debian/sipconfig.py
deleted file mode 100644
index a9e761f08..000000000
--- a/dilos/dependencies/sip4-tqt/debian/sipconfig.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-sip-tqt-dbg not installed'
-else:
-    from sipconfig_nd import *
-    from sipconfig_nd import _pkg_config, _default_macros
diff --git a/dilos/dependencies/sip4-tqt/debian/watch b/dilos/dependencies/sip4-tqt/debian/watch
deleted file mode 100644
index 1ff1f0839..000000000
--- a/dilos/dependencies/sip4-tqt/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.riverbankcomputing.co.uk/software/sip/download \
-      /static/Downloads/sip4/sip-([\d\.]*)\.tar\.gz debian uupdate
diff --git a/dilos/dependencies/sip4-tqt/debian/manpages/sip.1 b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1
index ce178cc7e..ef824974f 100644
--- a/dilos/dependencies/sip4-tqt/debian/manpages/sip.1
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1
@@ -1,26 +1,26 @@
 .\"
 .\" Created by Ricardo Cárdenes Medina <ricardo@conysis.com>
-.\" for the Debian 'sip' package
+.\" for the Debian 'sip-tqt' package
 .\"
-.TH SIP 1 "2010/02/02"
+.TH SIP-TQT 1 "2010/02/02"
 .SH NAME
-sip \- generates C++/Python bindings
+sip-tqt \- generates C++/Python bindings
 .SH SYNOPSIS
-.B sip
+.B sip-tqt
 [\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
+.B sip-tqt
 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.
+sip-tqt 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
+Display the sip-tqt version number
 .TP
 .B \-a file
 The name of the QScintilla API file. If not indicated, it will not
@@ -43,7 +43,7 @@ Enable support for exceptions. Disabled by default.
 Always release and reaquire the GIL.
 .TP
 .B -I dir
-Directory where sip can search for included files.
+Directory where sip-tqt can search for included files.
 .TP
 .B -j number
 Splits the generated code in \fInumber\fR files (1 by default). This
@@ -66,7 +66,7 @@ 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
+defined with a %Timeline directive. If you don't specify one, sip-tqt
 will generate the latest available.
 .TP
 .B -w
@@ -80,7 +80,7 @@ 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.
+sip-tqt 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/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
index ba33bb512..b3b0eafea 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
@@ -1,2 +1,2 @@
-debian/manpages/sip.1
+debian/manpages/sip-tqt.1
 debian/manpages/dh_sip_tqt.1
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
index 9639c2814..bfa1b37f6 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/sip4_tqt/sip.so
+usr/lib/python*/*-packages/sip_tqt.so
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/rules b/ubuntu/_base/dependencies/sip4-tqt/debian/rules
index 1feb9c154..1b07c97d2 100755
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/rules
@@ -47,7 +47,7 @@ build-%/configure-stamp:
 	mkdir -p build-$*
 	cd build-$* \
 		&& python$* ../configure.py \
-			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
+			-d /usr/lib/python$*/$(call py_sitename,$*) \
 			-g python$* \
 			-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 $@
@@ -57,7 +57,7 @@ dbg-build-%/configure-stamp:
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* \
 		&& python$*-dbg ../configure.py \
-			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
+			-d /usr/lib/python$*/$(call py_sitename,$*) \
 			-g python$* \
 			-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=""
@@ -110,18 +110,17 @@ install-arch: build
 install-arch-%:
 	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
 	$(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
-	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
+	mkdir -p debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/
+	install -m 644 -o root -g root debian/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config.py
+	install -m 644 -o root -g root build-$*/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_nd.py
+	install -m 644 -o root -g root dbg-build-$*/sip_tqt_config.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_d.py
 	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$*/
+	install -m 644 -o root -g root siplib/sip-tqt.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-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
+	ln -s ../python$*/sip-tqt.h \
+	    debian/python-sip-tqt-dev/usr/include/python$*_d/sip-tqt.h
+	mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
+	install -m 644 -o root -g root sip_tqt_distutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
 
 
 # Must not depend on anything. This is to be called by
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py b/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py
new file mode 100644
index 000000000..33ebcb65b
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py
@@ -0,0 +1,13 @@
+# import the sip_tqt_config.py for the normal or the debug build
+
+import sys
+
+if getattr(sys, "pydebug", False):
+    try:
+        from sip_tqt_config_d import *
+        from sip_tqt_config_d import _pkg_config, _default_macros
+    except ImportError, msg:
+        raise ImportError, 'No module named sip_config; package python-sip-tqt-dbg not installed'
+else:
+    from sip_tqt_config_nd import *
+    from sip_tqt_config_nd import _pkg_config, _default_macros
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py b/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py
deleted file mode 100644
index a9e761f08..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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-sip-tqt-dbg not installed'
-else:
-    from sipconfig_nd import *
-    from sipconfig_nd import _pkg_config, _default_macros
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/watch b/ubuntu/_base/dependencies/sip4-tqt/debian/watch
deleted file mode 100644
index 1ff1f0839..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.riverbankcomputing.co.uk/software/sip/download \
-      /static/Downloads/sip4/sip-([\d\.]*)\.tar\.gz debian uupdate