← Back to branch summary

~ubuntu-branches/ubuntu/vivid/qscintilla2/vivid

« back to all changes in this revision

Viewing changes to .pc/fix-lib-install-dir.diff/Qt4Qt5/qscintilla.pro

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman
  • Date: 2014-09-21 22:09:22 UTC
  • mfrom: (1.3.15)
  • Revision ID: package-import@ubuntu.com-20140921220922-u5j2l81yy8395ak5
Tags: 2.8.4+dfsg-1
* New upstream release
  - Repack tarball to remove sourcelss javascript files (doc/html-Qt4Qt5/
    jquery.js and doc/html-Qt3/jquery.js)
  - Update debian/patches/qt5_libname.patch to match upstream changes in the
    same area
  - Refresh patches
  - Temporarily bump pyqt5 build-dep version to 5.3.2+dfsg-2~ to make sure
    it builds against the current pyqt5 on all archs
* Bump standards version to 3.9.6 without further change
* Remove obsolete debian/README.Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/fix-lib-install-dir.diff/Qt4Qt5/qscintilla.pro
25
25
 
26
26
# This must be kept in sync with Python/configure.py, Python/configure-old.py,
27
27
# example-Qt4Qt5/application.pro and designer-Qt4Qt5/designer.pro.
28
 
!win32:VERSION = 11.2.0
 
28
!win32:VERSION = 11.3.0
29
29
 
30
30
TEMPLATE = lib
31
31
TARGET = qscintilla2
45
45
    greaterThan(QT_MINOR_VERSION, 1) {
46
46
            macx:QT += macextras
47
47
    }
 
48
 
 
49
    # Work around QTBUG-39300.
 
50
    CONFIG -= android_install
48
51
}
49
52
 
50
53
# Comment this in if you want the internal Scintilla classes to be placed in a