[med-svn] [sleepyhead] 04/05: Updating local patches for new release.

[Sergio Durigan Junior]

This is an automated email from the git hooks/post-receive script.

sergiodj-guest pushed a commit to branch master
in repository sleepyhead.

commit 443cae486e16997d00a5fcfd38ac7072e1c8c714
Author: Sergio Durigan Junior <sergiodj at sergiodj.net>
Date:   Fri Apr 29 00:02:22 2016 -0400

    Updating local patches for new release.
---
 debian/patches/0001-Do-not-use-bundled-libraries.patch         |  4 +++-
 debian/patches/0002-Create-install-rule-on-Makefile.patch      |  6 +++---
 ...003-Adapt-source-code-to-generate-reproducible-builds.patch | 10 +++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/patches/0001-Do-not-use-bundled-libraries.patch b/debian/patches/0001-Do-not-use-bundled-libraries.patch
index d4210ef..05204de 100644
--- a/debian/patches/0001-Do-not-use-bundled-libraries.patch
+++ b/debian/patches/0001-Do-not-use-bundled-libraries.patch
@@ -8,9 +8,11 @@ need to use them because Debian already provides their packages.
  sleepyhead/sleepyhead.pro | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
+diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro
+index 9133c60..3054615 100644
 --- a/sleepyhead/sleepyhead.pro
 +++ b/sleepyhead/sleepyhead.pro
-@@ -291,9 +291,12 @@ mac {
+@@ -300,9 +300,12 @@ mac {
      QT += serialport
  #}
  
diff --git a/debian/patches/0002-Create-install-rule-on-Makefile.patch b/debian/patches/0002-Create-install-rule-on-Makefile.patch
index b0393dd..738c42c 100644
--- a/debian/patches/0002-Create-install-rule-on-Makefile.patch
+++ b/debian/patches/0002-Create-install-rule-on-Makefile.patch
@@ -7,12 +7,12 @@ Subject: Create install rule on Makefile
  1 file changed, 2 insertions(+)
 
 diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro
-index c783db5..0e24df4 100644
+index 3054615..96d24bf 100644
 --- a/sleepyhead/sleepyhead.pro
 +++ b/sleepyhead/sleepyhead.pro
-@@ -41,6 +41,8 @@ CONFIG += rtti
+@@ -45,6 +45,8 @@ CONFIG += rtti
  TARGET = SleepyHead
- unix:!macx {
+ unix:!macx:!haiku {
      TARGET.path=/usr/bin
 +    target.path = /usr/bin
 +    INSTALLS += target
diff --git a/debian/patches/0003-Adapt-source-code-to-generate-reproducible-builds.patch b/debian/patches/0003-Adapt-source-code-to-generate-reproducible-builds.patch
index b52a803..6cb2037 100644
--- a/debian/patches/0003-Adapt-source-code-to-generate-reproducible-builds.patch
+++ b/debian/patches/0003-Adapt-source-code-to-generate-reproducible-builds.patch
@@ -11,22 +11,22 @@ from the package.
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp
-index c835ee8..65743f6 100644
+index 1d4c9b9..0495e28 100644
 --- a/sleepyhead/mainwindow.cpp
 +++ b/sleepyhead/mainwindow.cpp
-@@ -150,7 +150,7 @@ MainWindow::MainWindow(QWidget *parent) :
+@@ -162,7 +162,7 @@ MainWindow::MainWindow(QWidget *parent) :
  
-     this->setWindowTitle(STR_TR_SleepyHead + QString(" v%1 (" + tr("Profile") + ": %2)").arg(version).arg(PREF[STR_GEN_Profile].toString()));
+     this->setWindowTitle(STR_TR_SleepyHead + QString(" %1 (" + tr("Profile") + ": %2)").arg(version).arg(PREF[STR_GEN_Profile].toString()));
  
 -    qDebug() << STR_TR_SleepyHead << VersionString << "built with Qt" << QT_VERSION_STR << "on" << __DATE__ << __TIME__;
 +    qDebug() << STR_TR_SleepyHead << VersionString << "built with Qt" << QT_VERSION_STR;
  
  #ifdef BROKEN_OPENGL_BUILD
      qDebug() << "This build has been created especially for computers with older graphics hardware.\n";
-@@ -1368,7 +1368,6 @@ void MainWindow::on_action_About_triggered()
+@@ -1425,7 +1425,6 @@ void MainWindow::on_action_About_triggered()
                  "<table width=100%><tr><td>"
                  "<p><h1>" + STR_TR_SleepyHead +
-                 QString(" v%1 (%2)</h1></p><font color=black><p>").arg(VersionString).arg(ReleaseStatus) +
+                 QString(" %1</h1></p><font color=black><p>").arg(STR_TR_AppVersion) +
 -                tr("Build Date: %1 %2").arg(__DATE__).arg(__TIME__) +
                  QString("<br/>%1<br/>").arg(gitrev) +
                  tr("Graphics Engine: %1").arg(getGraphicsEngine())+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/sleepyhead.git