[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#695360: unblock: luckybackup/0.4.7-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package luckybackup

It adds an upstream patch to fix #694298, which should go to Wheezy.

unblock luckybackup/0.4.7-2


diff between 0.4.7-1 and 0.4.7-2:


diff -Naur '--exclude=.svn' 0.4.7-1/debian/changelog 0.4.7-2/debian/changelog
--- 0.4.7-1/debian/changelog    2012-07-18 20:15:45.000000000 +0200
+++ 0.4.7-2/debian/changelog    2012-12-07 16:05:12.718357029 +0100
@@ -1,3 +1,11 @@
+luckybackup (0.4.7-2) unstable; urgency=low
+
+  * Add upstream patch 01-include-state to fix not updated "include" states, if
+    the task was not selected.
+    Closes: #694298
+
+ -- Patrick Matthäi <pmatthaei@debian.org>  Fri, 07 Dec 2012 15:51:11 +0100
+
 luckybackup (0.4.7-1) unstable; urgency=low

   * New upstream release.
diff -Naur '--exclude=.svn' 0.4.7-1/debian/patches/01-include-state.diff 0.4.7-2/debian/patches/01-include-state.diff
--- 0.4.7-1/debian/patches/01-include-state.diff        1970-01-01 01:00:00.000000000 +0100
+++ 0.4.7-2/debian/patches/01-include-state.diff        2012-12-07 16:05:12.718357029 +0100
@@ -0,0 +1,79 @@
+# Upstream patch, to fix not updated "include" states, if the task was not selected.
+# Closes: #694298
+
+diff -Naur luckybackup-0.4.7.orig/src/luckybackupwindow.cpp luckybackup-0.4.7/src/luckybackupwindow.cpp
+--- luckybackup-0.4.7.orig/src/luckybackupwindow.cpp   2012-03-05 10:19:24.000000000 +0100
++++ luckybackup-0.4.7/src/luckybackupwindow.cpp        2012-12-07 15:41:01.294376491 +0100
+@@ -143,7 +143,7 @@
+     connect ( ui.pushButton_up, SIGNAL( clicked() ), this, SLOT( moveUp() ) );                //pushbutton up
+     connect ( ui.pushButton_down, SIGNAL( clicked() ), this, SLOT( moveDown() ) );            //pushbutton down
+     connect ( ui.pushButton_start, SIGNAL( clicked() ), this, SLOT( start() ) );              //pushbutton start
+-    connect ( ui.listWidget_operations, SIGNAL( itemClicked ( QListWidgetItem*) ), this, SLOT( checkCurrentItem() ) );
++    connect ( ui.listWidget_operations, SIGNAL( itemClicked ( QListWidgetItem*) ), this, SLOT( checkCurrentItem(QListWidgetItem *) ) );
+     connect ( ui.listWidget_operations, SIGNAL( itemChanged ( QListWidgetItem* ) ), this, SLOT( taskStateChanged() ) );
+
+     connect (ui.pushButton_minimizeToTray, SIGNAL (clicked() ), this, SLOT(minimizeTray()));//pushbutton minimize to tray
+@@ -171,7 +171,7 @@
+                                                 "</b><br>Operating system in use: <b>"+tempOSrunning +"</b><br><br>         Loukas :)");*/
+ // ********************* END of TESTING ******************************************************************************************
+
+-    checkCurrentItem();       //refresh the selected (last) task as well as the menu items that depend on its type (sync/backup)
++    checkCurrentItem(ui.listWidget_operations -> currentItem());    //refresh the selected (last) task as well as the menu items that depend on its type (sync/backup)
+
+     createProfileCombo();     // update the profile combobox with all existing profiles and set index to currentProfile
+     InfoData.append("<p align=\"center\"><font color=magenta><b>" + tr("Welcome to","full phrase: 'Welcome to luckyBackup'") +" "
+@@ -1021,7 +1021,7 @@
+         ui.listWidget_operations -> addItem( Operation[currentOperation] -> GetName() );
+         ui.listWidget_operations -> setCurrentRow(currentOperation);
+         ui.listWidget_operations -> currentItem() -> setCheckState(Qt::Unchecked);
+-        checkCurrentItem();
++        checkCurrentItem(ui.listWidget_operations -> currentItem());
+         TotalOperations = ui.listWidget_operations -> count();                //set the TotalOperations to what it is now
+         savedProfile = FALSE;                 //change profile status to "unsaved"
+         ui.actionSave -> setEnabled(TRUE);
+@@ -1075,7 +1075,7 @@
+         Operation[currentOperation] -> SetConnectRestore(tempConnect);                //set the connection to what it was
+         if (tempConnect != "")
+             Operation[connectPosition]->SetConnectRestore(newTaskName);
+-        checkCurrentItem();
++        checkCurrentItem(ui.listWidget_operations -> currentItem());
+
+         // update all relevant snap .changes as well as log files if the task name changes
+         if (newTaskName != oldTaskName)
+@@ -1166,7 +1166,7 @@
+     manageDialog managedialog;
+     managedialog.exec();
+
+-    checkCurrentItem();       //refresh the selected task
++    checkCurrentItem(ui.listWidget_operations -> currentItem());    //refresh the selected task
+     saveCurrentProfile();     // save the profile if any snapshots have been deleted
+ //    refreshList(); //refresh the listWidget_operations
+ }
+@@ -1309,12 +1309,14 @@
+
+ // checkCurrentItem =================================================================================================================================
+ // Checks the currently selected operation (if checked) for validity
+-void luckyBackupWindow::checkCurrentItem()
++void luckyBackupWindow::checkCurrentItem(QListWidgetItem *thisIsTheCurrentItem)
+ {
+     taskClicked = TRUE;       //this is used at taskStateChanged() to determine if a task state is changed
+
+     InfoData="";
+     CheckedData = "";
++    // use this because when a checkbox state changes and another item is selected, it remains this way. The checked one does not become selected !!
++    ui.listWidget_operations -> setCurrentItem(thisIsTheCurrentItem);
+     currentOperation = ui.listWidget_operations -> currentRow();
+
+     if (currentOperation < 0) // to avoid segfault when nothing selected
+diff -Naur luckybackup-0.4.7.orig/src/luckybackupwindow.h luckybackup-0.4.7/src/luckybackupwindow.h
+--- luckybackup-0.4.7.orig/src/luckybackupwindow.h     2012-02-01 18:38:39.000000000 +0100
++++ luckybackup-0.4.7/src/luckybackupwindow.h  2012-12-07 15:41:01.294376491 +0100
+@@ -80,7 +80,7 @@
+
+         void setLanguage(QAction *);  //SLOT: Change the application language
+
+-        void checkCurrentItem();      //SLOT: Check the currently selected operation and set an icon
++        void checkCurrentItem(QListWidgetItem *);   //SLOT: Check the currently selected operation and set an icon
+         void taskStateChanged();      //SLOT: Sets the profile state to unsaved if a task checkbox is changed
+         void refreshList();   //SLOT: Refresh the operations list when refresh button pressed
+         void start();         //SLOT: Open start operations dialog when Button clicked()
diff -Naur '--exclude=.svn' 0.4.7-1/debian/patches/series 0.4.7-2/debian/patches/series
--- 0.4.7-1/debian/patches/series       1970-01-01 01:00:00.000000000 +0100
+++ 0.4.7-2/debian/patches/series       2012-12-07 16:05:12.718357029 +0100
@@ -0,0 +1 @@
+01-include-state.diff




-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash


Reply to: