[Bug 797579] Re: Please merge qtcreator 2.1.0-1 (universe) from debian unstable

[Andres Rodriguez]

Hi Paolo!

I've reviewed your debdiff and uploaded it, and in general it looks
good! keep up the good work and I hope to see you soon as a MOTU.

I have two things though, that I've done to your debdiff:

First, I have refreshed the Kubuntu patch to make it apply cleanly
without the offsets.

Second this part bellow was removed, which seems to be a leftover diff
from having a -0ubuntu1 in Ubuntu first that was unnecessary kept in
Ubuntu, and I think it was better to drop it. However don't worry as I
have already done so:

--- qtcreator-2.1.0/debian/patches/01_fix_installation_paths.diff	2010-12-11 14:21:31.000000000 +0100
+++ qtcreator-2.1.0/debian/patches/01_fix_installation_paths.diff	2011-03-15 20:20:42.000000000 +0100
@@ -23,7 +23,7 @@
  }
 --- a/share/qtcreator/static.pro
 +++ b/share/qtcreator/static.pro
-@@ -69,7 +69,7 @@ DATA_DIRS = \
+@@ -67,7 +67,7 @@ DATA_DIRS = \
  !macx {
      for(data_dir, DATA_DIRS) {
          eval($${data_dir}.files = $$quote($$PWD/$$data_dir))
@@ -34,7 +34,7 @@
  }
 --- a/share/qtcreator/translations/translations.pro
 +++ b/share/qtcreator/translations/translations.pro
-@@ -112,6 +112,6 @@ isEmpty(vcproj) {
+@@ -101,6 +101,6 @@ isEmpty(vcproj) {
  }
  
  qmfiles.files = $$prependAll(LANGUAGES, $$OUT_PWD/qtcreator_,.qm)
@@ -76,7 +76,7 @@
  OTHER_FILES += Core.pluginspec editormanager/BinFiles.mimetypes.xml
 --- a/src/qtcreatorlibrary.pri
 +++ b/src/qtcreatorlibrary.pri
-@@ -20,7 +20,7 @@ contains(QT_CONFIG, reduce_exports):CONF
+@@ -17,7 +17,7 @@ contains(QT_CONFIG, reduce_exports):CONF
          target.path = /bin
          target.files = $$DESTDIR/$${TARGET}.dll
      } else {
@@ -87,7 +87,7 @@
  }
 --- a/src/qtcreatorplugin.pri
 +++ b/src/qtcreatorplugin.pri
-@@ -45,9 +45,9 @@ contains(QT_CONFIG, reduce_exports):CONF
+@@ -42,9 +42,9 @@ contains(QT_CONFIG, reduce_exports):CONF
  CONFIG += plugin plugin_with_soname
  
  !macx {

I'm attaching debdiff for you to see. Other than that everything else
looks great!

Thank yopu for your contribution! Cheers,

** Patch added: "qtcreator.debdiff"
   https://bugs.launchpad.net/ubuntu/+source/qtcreator/+bug/797579/+attachment/2170391/+files/qtcreator.debdiff

-- 
You received this bug notification because you are a member of Ubuntu
Sponsors Team, which is subscribed to the bug report.
https://bugs.launchpad.net/bugs/797579

Title:
  Please merge qtcreator 2.1.0-1 (universe) from debian unstable

Status in “qtcreator” package in Ubuntu:
  In Progress

Bug description:
  Binary package hint: qtcreator

  Please merge qtcreator 2.1.0-1 (universe) from debian unstable.

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/qtcreator/+bug/797579/+subscriptions