Commit 62d052cb authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Maemo: Fix section name in Debian control file.

It's "user/other" for Harmattan, apparently...
parent dfce840d
......@@ -846,7 +846,7 @@ bool AbstractDebBasedQt4MaemoTarget::adaptControlFile()
QByteArray controlContents = controlFile.readAll();
adaptControlFileField(controlContents, "Section", "user/hidden");
adaptControlFileField(controlContents, "Section", defaultSection());
adaptControlFileField(controlContents, "Priority", "optional");
adaptControlFileField(controlContents, packageManagerNameFieldName(),
project()->displayName().toUtf8());
......@@ -1124,6 +1124,11 @@ QByteArray Qt4Maemo5Target::packageManagerNameFieldName() const
return "XB-Maemo-Display-Name";
}
QByteArray Qt4Maemo5Target::defaultSection() const
{
return "user/hidden";
}
Qt4HarmattanTarget::Qt4HarmattanTarget(Qt4Project *parent, const QString &id)
: AbstractDebBasedQt4MaemoTarget(parent, id)
{
......@@ -1155,6 +1160,11 @@ QByteArray Qt4HarmattanTarget::packageManagerNameFieldName() const
return "XSBC-Maemo-Display-Name";
}
QByteArray Qt4HarmattanTarget::defaultSection() const
{
return "user/other";
}
Qt4MeegoTarget::Qt4MeegoTarget(Qt4Project *parent, const QString &id)
: AbstractRpmBasedQt4MaemoTarget(parent, id)
......
......@@ -177,6 +177,7 @@ private:
virtual void addAdditionalControlFileFields(QByteArray &controlContents)=0;
virtual QByteArray packageManagerNameFieldName() const=0;
virtual QByteArray defaultSection() const=0;
QString changeLogFilePath() const;
QString controlFilePath() const;
......@@ -251,6 +252,7 @@ private:
virtual void addAdditionalControlFileFields(QByteArray &controlContents);
virtual QString debianDirName() const;
virtual QByteArray packageManagerNameFieldName() const;
virtual QByteArray defaultSection() const;
};
......@@ -271,6 +273,7 @@ private:
virtual void addAdditionalControlFileFields(QByteArray &controlContents);
virtual QString debianDirName() const;
virtual QByteArray packageManagerNameFieldName() const;
virtual QByteArray defaultSection() const;
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment