← Back to branch summary

~ubuntu-branches/ubuntu/precise/python-qt4/precise-proposed

« back to all changes in this revision

Viewing changes to debian/patches/debian_configure_changes.diff

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell, Jonathan Riddell
  • Date: 2010-11-08 16:13:33 UTC
  • mfrom: (1.5.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20101108161333-0nec4wu0nz3wpf9r
Tags: 4.8.1-0ubuntu1
[ Jonathan Riddell ]
* New upstream release
* Build against python-sip-dev 4.11.2
* Remove kubuntu_02_fix-scpk-and-flag-issue.diff merged upstream
* Install __init__.py into /usr/lib/python3.2/dist-packages/PyQt4,
  fixes Python 3 support
* Add QtDeclarative to python-qt4
* Add kubuntu_03_uiparser.diff from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/debian_configure_changes.diff
1
 
Index: python-qt4-4.7.2/configure.py
 
1
Index: PyQt-x11-gpl-4.8.1/configure.py
2
2
===================================================================
3
 
--- python-qt4-4.7.2.orig/configure.py  2010-03-25 23:53:55.468631945 +0100
4
 
+++ python-qt4-4.7.2/configure.py       2010-03-25 23:54:05.364664390 +0100
5
 
@@ -806,33 +806,7 @@
 
3
--- PyQt-x11-gpl-4.8.1.orig/configure.py        2010-11-08 14:56:59.896327001 +0000
 
4
+++ PyQt-x11-gpl-4.8.1/configure.py     2010-11-08 14:57:07.532327000 +0000
 
5
@@ -829,33 +829,7 @@
6
6
             makefile.generate()
7
7
             tool.append("dbus")
8
8
 
36
36
 
37
37
         sipconfig.inform("Creating pyuic4 Makefile...")
38
38
 
39
 
@@ -841,7 +815,6 @@
 
39
@@ -864,7 +838,6 @@
40
40
             dstdir=uicdir,
41
41
             srcdir=os.path.join(src_dir, "pyuic", "uic"),
42
42
             dir="pyuic",