diff -Nru qtcreator-2.1.0/debian/changelog qtcreator-2.1.0/debian/changelog --- qtcreator-2.1.0/debian/changelog 2011-03-10 03:45:49.000000000 -0500 +++ qtcreator-2.1.0/debian/changelog 2011-06-15 14:29:37.000000000 -0400 @@ -1,3 +1,14 @@ +qtcreator (2.1.0-1ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. (LP: #797579) Remaining changes: + - add kubuntu_01_define_qt_webkit.diff + - qtcreator suggests kdelibs5-data + - Install icons to /usr/share/icons/hicolor/*/apps instead of + /usr/share/pixmaps with different names. + - Updated qtcreator.install file. + + -- Paolo Sammicheli Tue, 15 Mar 2011 19:20:43 +0000 + qtcreator (2.1.0-1) unstable; urgency=low * New upstream release. @@ -5,6 +16,19 @@ -- Fathi Boudra Wed, 16 Feb 2011 08:49:10 +0200 +qtcreator (2.1.0-0ubuntu2) natty; urgency=low + + * Install icons to /usr/share/icons/hicolor/*/apps instead of + /usr/share/pixmaps with different names. (LP: #732988) + + -- Felix Geyer Fri, 11 Mar 2011 10:58:01 +0100 + +qtcreator (2.1.0-0ubuntu1) natty; urgency=low + + * New upstream release. (LP: #725363) + + -- Felix Geyer Tue, 01 Mar 2011 12:07:29 +0100 + qtcreator (2.1.0~rc1-1) experimental; urgency=low * New upstream release. @@ -14,6 +38,24 @@ -- Fathi Boudra Sat, 11 Dec 2010 15:17:02 +0200 +qtcreator (2.1.0~rc1-0ubuntu1) natty; urgency=low + + * New upstream release candidate. + * Update qtcreator.install file. + + -- Felix Geyer Sat, 27 Nov 2010 12:31:53 +0100 + +qtcreator (2.1.0~beta2-0ubuntu1) natty; urgency=low + + * New upstream release. + * Update qtcreator.install file. + * Merge from Debian experimental, remaining changes: + - build-depend on libqtwebkit-dev + - add kubuntu_01_define_qt_webkit.diff + - qtcreator suggests kdelibs5-data + + -- Felix Geyer Tue, 09 Nov 2010 12:18:18 +0100 + qtcreator (2.1.0~beta1-1) experimental; urgency=low * New upstream release. @@ -24,6 +66,37 @@ -- Fathi Boudra Sat, 09 Oct 2010 19:55:37 +0300 +qtcreator (2.1.0~beta1-0ubuntu1) natty; urgency=low + + * New upstream beta. + * Refresh patches. + * Update install files. + * Make qtcreator suggest kdelibs5-data. + + -- Felix Geyer Fri, 15 Oct 2010 23:20:27 +0200 + +qtcreator (2.0.1-1ubuntu3) maverick; urgency=low + + * Don't ignore shared library dependencies of the plugins. QtCreator + displays a warning on startup when they are missing. (LP: #645740) + + -- Felix Geyer Thu, 23 Sep 2010 17:08:16 +0200 + +qtcreator (2.0.1-1ubuntu2) maverick; urgency=low + + * Make the internal help viewer use QtWebKit so it can properly display + the Qt documentation. (LP: #626180) + - build-depend on libqtwebkit-dev + - add kubuntu_01_define_qt_webkit.diff + + -- Felix Geyer Thu, 16 Sep 2010 01:41:10 +0200 + +qtcreator (2.0.1-1ubuntu1) maverick; urgency=low + + * Fake sync from Debian due to different MD5sums on .orig.tar.gz + + -- Jonathan Riddell Thu, 09 Sep 2010 16:26:43 +0100 + qtcreator (2.0.1-1) experimental; urgency=low * New upstream release. @@ -36,6 +109,23 @@ -- Fathi Boudra Wed, 25 Aug 2010 14:26:11 +0300 +qtcreator (2.0.1-0ubuntu2) maverick; urgency=low + + * Rebuild against Qt 4.7 rc1 (LP: #630687) + + -- Harald Sitter Sun, 05 Sep 2010 11:16:39 +0200 + +qtcreator (2.0.1-0ubuntu1) maverick; urgency=low + + * Merge with Debian experimental, no remaining changes. + * New upstream release. + * Update debian/qtcreator.install file. + * Adapt 01_fix_installation_paths.diff to new upstream version. + * Fix installation error with Qt <= 4.7 Beta 2. + - Add kubuntu_01_fix_install_qt47beta.diff + + -- Felix Geyer Wed, 25 Aug 2010 16:34:37 +0200 + qtcreator (2.0.0-1) experimental; urgency=low * New upstream release. @@ -51,6 +141,37 @@ -- Fathi Boudra Thu, 08 Jul 2010 17:39:46 +0300 +qtcreator (2.0.0-0ubuntu1) maverick; urgency=low + + * New upstream release + - Synch debian/patches with Debian git + - Update install files + + -- Alessandro Ghersi Sat, 03 Jul 2010 19:30:46 +0200 + +qtcreator (2.0.0~rc1-0ubuntu1) maverick; urgency=low + + * New upstream release + * Remove kubuntu_02_qtgui_includes.diff and debian/patches,patch was applied upstream + * Fix qtcreator.install + * Fix crash on start (LP: #592786) + + -- Rohan Garg Tue, 15 Jun 2010 19:38:06 +0530 + +qtcreator (2.0.0~beta1-0ubuntu1) maverick; urgency=low + + * New upstream release + * Build-dep on Qt 4.7 + * Use source format 3.0 + * Add kubuntu_02_qtgui_includes.diff to compile correctly, from upstream + * Set INSTALL_ROOT=$(DEB_DESTDIR)/usr rather than complex patch to + qmake .pro files used by Debian + * Qt Creator 2.0 depends on private headers used by Qt, include Qt + headers in debian/includes and point to them in debian/rules + * Depend on the current specific version of Qt + + -- Jonathan Riddell Fri, 21 May 2010 11:56:35 +0100 + qtcreator (1.3.1-2) unstable; urgency=low * Upload to unstable. @@ -63,6 +184,22 @@ -- Fathi Boudra Tue, 18 May 2010 16:28:06 +0300 +qtcreator (1.3.1-1ubuntu1) lucid; urgency=low + + * Merge with Debian Experimental, remaining changes (LP: #536748): + - Add qt-creator transitional package + - debian/control: Conflicts on qt-creator (<< 1.2.1-1ubuntu1) + - debian/rules: set QMAKE explicitly to qmake-qt4 + * Note that all other changes (most importantly those from 1.3.0-0ubuntu1) + were completely dropped, since Debian uses a full-source packaging branch + and thus the diff.gz is 100% legitimate, hence the delta would not ever + become droppable. Possibly Debian could switch to source format 3 so that + Ubuntu can sync package with patches while Debian internal development would + still be based on full-source git. + DO NOT CONVERT DIRECT DEBIAN CHANGES TO PATCHES! + + -- Harald Sitter Wed, 10 Mar 2010 17:48:29 +0100 + qtcreator (1.3.1-1) experimental; urgency=low * New upstream release. @@ -84,6 +221,38 @@ -- Adam Majer Sat, 26 Dec 2009 23:17:34 -0600 +qtcreator (1.3.0-0ubuntu2) lucid; urgency=low + + * debian/control: Corrected Qt4 epoch. + + -- Maia Kozheva Tue, 22 Dec 2009 16:08:31 +0600 + +qtcreator (1.3.0-0ubuntu1) lucid; urgency=low + + * New upstream release. + * Added debian/watch. + * Added quilt patch system. Split build system changes from the diff.gz into + several patches in debian/patches: + - buildsystem.patch: Make the upstream build system install files in correct + locations. + - debugginghelper.patch: Use /usr/lib/qtcreator/gdbmacros as an additional + debugging helper location. + - help-path.patch: Correct path to qtcreator.qch. + - x-terminal.patch: Use x-terminal-emulator instead of xterm. + * debian/rules: Force qmake-qt4 (in case Qt3 is also installed). + * debian/qtcreator.install: Updated plugin list. + + -- Maia Kozheva Tue, 22 Dec 2009 12:14:37 +0600 + +qtcreator (1.2.1-3ubuntu1) karmic; urgency=low + + * Merge from Debian unstable, remaining changes: + - Add qt-creator transitional package + - debian/control: Conflicts on qt-creator (<< 1.2.1-1ubuntu1) + Bugfixes: (LP: #372668) + + -- Jonathan Thomas Tue, 01 Sep 2009 13:15:37 -0400 + qtcreator (1.2.1-3) unstable; urgency=low [ Fathi Boudra ] @@ -104,6 +273,14 @@ -- Adam Majer Thu, 30 Jul 2009 09:18:51 -0500 +qtcreator (1.2.1-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #399414), remaining changes: + - Add qt-creator transitional package. + * debian/control: Conflicts on qt-creator (<< 1.2.1-1ubuntu1). + + -- Andres Rodriguez Sun, 19 Jul 2009 16:23:52 -0500 + qtcreator (1.2.1-1) unstable; urgency=low * New upstream release. @@ -151,6 +328,13 @@ -- Adam Majer Sun, 12 Jul 2009 18:52:19 -0500 +qtcreator (1.1.0-1ubuntu1) karmic; urgency=low + + * Add qt-creator transitional package (LP: #378910) + * Conflict qt-creator << 1.1.0-1ubuntu1 + + -- Alessandro Ghersi Thu, 21 May 2009 05:31:05 +0200 + qtcreator (1.1.0-1) unstable; urgency=low * New upstream release. diff -Nru qtcreator-2.1.0/debian/control qtcreator-2.1.0/debian/control --- qtcreator-2.1.0/debian/control 2011-03-09 08:40:48.000000000 -0500 +++ qtcreator-2.1.0/debian/control 2011-06-15 14:29:37.000000000 -0400 @@ -1,7 +1,8 @@ Source: qtcreator Section: devel Priority: optional -Maintainer: Debian Qt/KDE Maintainers +Maintainer: Kubuntu Developers +XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Adam Majer , Fathi Boudra , Jeremy Lainé Build-Depends: debhelper (>= 7.4.15), libqt4-dev (>= 4:4.7.1), qt4-dev-tools (>= 4:4.7.1), libqtwebkit-dev @@ -16,7 +17,7 @@ libqt4-help, libqt4-sql-sqlite Recommends: qtcreator-doc, qt4-dev-tools, qt4-doc, qt4-demos, gdb, make, xterm | x-terminal-emulator -Suggests: cmake, git-core, subversion +Suggests: cmake, git-core, subversion, kdelibs5-data Description: lightweight integrated development environment (IDE) for Qt Qt Creator is a new, lightweight, cross-platform integrated development environment (IDE) designed to make development with the Qt application diff -Nru qtcreator-2.1.0/debian/patches/kubuntu_01_define_qt_webkit.diff qtcreator-2.1.0/debian/patches/kubuntu_01_define_qt_webkit.diff --- qtcreator-2.1.0/debian/patches/kubuntu_01_define_qt_webkit.diff 1969-12-31 19:00:00.000000000 -0500 +++ qtcreator-2.1.0/debian/patches/kubuntu_01_define_qt_webkit.diff 2011-06-15 14:29:51.000000000 -0400 @@ -0,0 +1,16 @@ +Description: Define QT_WEBKIT when the help plugin is built with QtWebKit support. + Otherwise Qt defines QT_NO_WEBKIT and QtWebKit is not actually used. +Author: Felix Geyer + +Index: qtcreator-2.1.0/src/plugins/help/help.pro +=================================================================== +--- qtcreator-2.1.0.orig/src/plugins/help/help.pro 2011-02-11 05:29:12.000000000 -0500 ++++ qtcreator-2.1.0/src/plugins/help/help.pro 2011-06-15 14:29:48.919878124 -0400 +@@ -63,6 +63,7 @@ + + contains(QT_CONFIG, webkit) { + QT += webkit ++ DEFINES += QT_WEBKIT + } + + OTHER_FILES += Help.pluginspec diff -Nru qtcreator-2.1.0/debian/patches/series qtcreator-2.1.0/debian/patches/series --- qtcreator-2.1.0/debian/patches/series 2010-12-11 08:16:55.000000000 -0500 +++ qtcreator-2.1.0/debian/patches/series 2011-06-15 14:29:37.000000000 -0400 @@ -2,3 +2,4 @@ 02_use_x-terminal-emulator.diff 03_fix_DOCPATH.diff 04_append_Debian_search_path_for_pre-built_gdbmacros.diff +kubuntu_01_define_qt_webkit.diff diff -Nru qtcreator-2.1.0/debian/qtcreator.desktop qtcreator-2.1.0/debian/qtcreator.desktop --- qtcreator-2.1.0/debian/qtcreator.desktop 2010-12-11 08:04:44.000000000 -0500 +++ qtcreator-2.1.0/debian/qtcreator.desktop 2011-06-15 14:29:37.000000000 -0400 @@ -1,6 +1,6 @@ [Desktop Entry] Exec=qtcreator %F -Icon=qtcreator_logo_32 +Icon=qtcreator Type=Application Terminal=false Name=Qt Creator diff -Nru qtcreator-2.1.0/debian/qtcreator.install qtcreator-2.1.0/debian/qtcreator.install --- qtcreator-2.1.0/debian/qtcreator.install 2010-12-11 09:50:30.000000000 -0500 +++ qtcreator-2.1.0/debian/qtcreator.install 2011-06-15 14:29:37.000000000 -0400 @@ -1,6 +1,6 @@ debian/Nokia-QtCreator.xml usr/share/mime/packages/ debian/qtcreator.desktop usr/share/applications/ -share/qtcreator/gdbmacros/libgdbmacros.so* usr/lib/qtcreator/gdbmacros/ +share/qtcreator/gdbmacros/libgdbmacros.* usr/lib/qtcreator/gdbmacros/ usr/bin/qtcreator usr/bin/qtcreator_process_stub usr/lib/qtcreator/libAggregation.* @@ -77,14 +77,13 @@ usr/lib/qtcreator/plugins/Nokia/libTextEditor.so usr/lib/qtcreator/plugins/Nokia/libVCSBase.so usr/lib/qtcreator/plugins/Nokia/libWelcome.so -usr/share/pixmaps/qtcreator_logo_128.png -usr/share/pixmaps/qtcreator_logo_16.png -usr/share/pixmaps/qtcreator_logo_24.png -usr/share/pixmaps/qtcreator_logo_256.png -usr/share/pixmaps/qtcreator_logo_32.png -usr/share/pixmaps/qtcreator_logo_48.png -usr/share/pixmaps/qtcreator_logo_512.png -usr/share/pixmaps/qtcreator_logo_64.png +usr/share/icons/hicolor/16x16/apps/qtcreator.png +usr/share/icons/hicolor/24x24/apps/qtcreator.png +usr/share/icons/hicolor/32x32/apps/qtcreator.png +usr/share/icons/hicolor/48x48/apps/qtcreator.png +usr/share/icons/hicolor/64x64/apps/qtcreator.png +usr/share/icons/hicolor/128x128/apps/qtcreator.png +usr/share/icons/hicolor/256x256/apps/qtcreator.png usr/share/qtcreator/designer/templates.xml usr/share/qtcreator/designer/templates/Dialog_with_Buttons_Bottom.ui usr/share/qtcreator/designer/templates/Dialog_with_Buttons_Right.ui @@ -92,8 +91,6 @@ usr/share/qtcreator/designer/templates/Main_Window.ui usr/share/qtcreator/designer/templates/Widget.ui usr/share/qtcreator/examplebrowser/qmlexamples.xml -usr/share/qtcreator/gdbmacros/LGPL_EXCEPTION.TXT -usr/share/qtcreator/gdbmacros/LICENSE.LGPL usr/share/qtcreator/gdbmacros/dumper.py usr/share/qtcreator/gdbmacros/gdbmacros.cpp usr/share/qtcreator/gdbmacros/gdbmacros.h @@ -103,20 +100,7 @@ usr/share/qtcreator/gdbmacros/pdumper.py usr/share/qtcreator/gdbmacros/test/dumpertest.pro usr/share/qtcreator/gdbmacros/test/main.cpp -usr/share/qtcreator/generic-highlighter/alert.xml -usr/share/qtcreator/generic-highlighter/bash.xml -usr/share/qtcreator/generic-highlighter/cmake.xml -usr/share/qtcreator/generic-highlighter/css.xml -usr/share/qtcreator/generic-highlighter/doxygen.xml -usr/share/qtcreator/generic-highlighter/dtd.xml -usr/share/qtcreator/generic-highlighter/html.xml -usr/share/qtcreator/generic-highlighter/ini.xml -usr/share/qtcreator/generic-highlighter/java.xml -usr/share/qtcreator/generic-highlighter/javadoc.xml -usr/share/qtcreator/generic-highlighter/perl.xml -usr/share/qtcreator/generic-highlighter/ruby.xml -usr/share/qtcreator/generic-highlighter/xml.xml -usr/share/qtcreator/generic-highlighter/yacc.xml +usr/share/qtcreator/generic-highlighter/*.xml usr/share/qtcreator/qml-type-descriptions/qml-builtin-types.xml usr/share/qtcreator/qml-type-descriptions/qmlproject-types.xml usr/share/qtcreator/qml-type-descriptions/qmlruntime-types.xml @@ -182,6 +166,7 @@ usr/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h usr/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h usr/share/qtcreator/qml/qmljsdebugger/include/qmlobserverconstants.h +usr/share/qtcreator/qml/qmljsdebugger/include/qt_private usr/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h usr/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h usr/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp @@ -195,6 +180,7 @@ usr/share/qtcreator/qml/qmlobserver/LGPL_EXCEPTION.TXT usr/share/qtcreator/qml/qmlobserver/LICENSE.LGPL usr/share/qtcreator/qml/qmlobserver/content/Browser.qml +usr/share/qtcreator/qml/qmlobserver/content/images usr/share/qtcreator/qml/qmlobserver/content/images/folder.png usr/share/qtcreator/qml/qmlobserver/content/images/titlebar.png usr/share/qtcreator/qml/qmlobserver/content/images/titlebar.sci @@ -379,6 +365,7 @@ usr/share/qtcreator/styles/default.xml usr/share/qtcreator/styles/grayscale.xml usr/share/qtcreator/styles/intellij.xml +usr/share/qtcreator/templates/mobileapp usr/share/qtcreator/templates/mobileapp/app.pro usr/share/qtcreator/templates/mobileapp/main.cpp usr/share/qtcreator/templates/mobileapp/mainwindow.cpp diff -Nru qtcreator-2.1.0/debian/qtcreator.links qtcreator-2.1.0/debian/qtcreator.links --- qtcreator-2.1.0/debian/qtcreator.links 2010-12-11 08:04:44.000000000 -0500 +++ qtcreator-2.1.0/debian/qtcreator.links 2011-06-15 14:29:37.000000000 -0400 @@ -1,3 +1,4 @@ # Needed for source code of gdbmacros /usr/share/common-licenses/LGPL-2.1 /usr/share/qtcreator/gdbmacros/LICENSE.LGPL /usr/share/doc/qtcreator/LGPL_EXCEPTION.TXT /usr/share/qtcreator/gdbmacros/LGPL_EXCEPTION.TXT +/usr/share/icons/hicolor/32x32/apps/qtcreator.png /usr/share/pixmaps/qtcreator.png diff -Nru qtcreator-2.1.0/debian/rules qtcreator-2.1.0/debian/rules --- qtcreator-2.1.0/debian/rules 2011-03-10 03:38:43.000000000 -0500 +++ qtcreator-2.1.0/debian/rules 2011-06-15 14:29:37.000000000 -0400 @@ -19,6 +19,32 @@ dh_auto_build cd share/qtcreator/gdbmacros; $(MAKE) +override_dh_auto_install: + dh_auto_install + + mkdir -p debian/tmp/usr/share/icons/hicolor/16x16/apps + mkdir -p debian/tmp/usr/share/icons/hicolor/24x24/apps + mkdir -p debian/tmp/usr/share/icons/hicolor/32x32/apps + mkdir -p debian/tmp/usr/share/icons/hicolor/48x48/apps + mkdir -p debian/tmp/usr/share/icons/hicolor/64x64/apps + mkdir -p debian/tmp/usr/share/icons/hicolor/128x128/apps + mkdir -p debian/tmp/usr/share/icons/hicolor/256x256/apps + + mv debian/tmp/usr/share/pixmaps/qtcreator_logo_16.png \ + debian/tmp/usr/share/icons/hicolor/16x16/apps/qtcreator.png + mv debian/tmp/usr/share/pixmaps/qtcreator_logo_24.png \ + debian/tmp/usr/share/icons/hicolor/24x24/apps/qtcreator.png + mv debian/tmp/usr/share/pixmaps/qtcreator_logo_32.png \ + debian/tmp/usr/share/icons/hicolor/32x32/apps/qtcreator.png + mv debian/tmp/usr/share/pixmaps/qtcreator_logo_48.png \ + debian/tmp/usr/share/icons/hicolor/48x48/apps/qtcreator.png + mv debian/tmp/usr/share/pixmaps/qtcreator_logo_64.png \ + debian/tmp/usr/share/icons/hicolor/64x64/apps/qtcreator.png + mv debian/tmp/usr/share/pixmaps/qtcreator_logo_128.png \ + debian/tmp/usr/share/icons/hicolor/128x128/apps/qtcreator.png + mv debian/tmp/usr/share/pixmaps/qtcreator_logo_256.png \ + debian/tmp/usr/share/icons/hicolor/256x256/apps/qtcreator.png + override_dh_auto_clean: dh_auto_clean cd share/qtcreator/gdbmacros; if [ -e Makefile ]; then $(MAKE) distclean; fi