Update watch and changlog; fix the spelling errors

debian/changelog

@@ -1,3 +1,29 @@
+kylin-nm (1.2.3-1) unstable; urgency=medium
+
+  * New upstream bugfix release:
+    - Fix the error when communicate with ukui-control-center.
+    - Can't click save button when there is empty entry when configure
+      network.
+    - Fix the incorrect position of some buttons.
+    - Fix the crash when switch the wifi.
+    - Fix the wrong position between upload icon and download icon.
+    - Fix the occasional crash when get ipv4 and ipv6.
+    - Fix the wrong position of right-click menu.
+    - Fix that can't get normal message from ukui-panel.
+    - Fix that no notification after modify the configuration.
+    - Fix the error when state of connection and speed of network
+      display at the same time.
+  * debian/control:
+    - Add libgsettings-qt-dev, libkf5windowsystem-dev to build-depends.
+
+ -- handsome_feng <jianfengli@ubuntukylin.com>  Mon, 06 Apr 2020 23:11:15 +0800
+
+kylin-nm (1.2.2.1-1) unstable; urgency=medium
+
+  * Remove the .qmake.stash witch cause the build failed.
+
+ -- handsome_feng <jianfengli@ubuntukylin.com>  Sat, 14 Mar 2020 18:48:03 +0800
+
 kylin-nm (1.2.2-1) unstable; urgency=medium
 
   * New upstream release.

debian/control

@@ -22,7 +22,6 @@ Vcs-Browser: https://github.com/ukui/kylin-nm
 Package: kylin-nm
 Architecture: any
 Depends: network-manager (>=1.12.4),
-         libkf5windowsystem5,
          ${shlibs:Depends},
          ${misc:Depends}
 Description: Gui Applet tool for display and edit network simply

debian/watch

@@ -1,3 +1,2 @@
 version=4
-opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/kylin-nm-$1\.tar\.gz/ \
-  https://github.com/ukui/kylin-nm/releases .*/v?(\d\S+)\.tar\.gz
+https://github.com/ukui/kylin-nm/releases .*/kylin-nm_(\d\S+)\.orig\.tar\.gz

src/backthread.cpp

@@ -413,8 +413,8 @@ void BackThread::disConnLanOrWifi(QString type)
 
     p_file = popen("nmcli connection show -active", "r");
     if (!p_file) {
-        syslog(LOG_ERR, "Error occured when popen cmd 'nmcli connection show'");
-        qDebug()<<"Error occured when popen cmd 'nmcli connection show";
+        syslog(LOG_ERR, "Error occurred when popen cmd 'nmcli connection show'");
+        qDebug()<<"Error occurred when popen cmd 'nmcli connection show";
     }
 
     while (fgets(buf, BUF_SIZE, p_file) != NULL) {

src/mainwindow.cpp

@@ -401,8 +401,8 @@ void MainWindow::getInitLanSlist()
 
     p_file = popen("nmcli connection show", "r");
     if (!p_file) {
-        syslog(LOG_ERR, "Error occured when popen cmd 'nmcli connection show'");
-        qDebug()<<"Error occured when popen cmd 'nmcli connection show";
+        syslog(LOG_ERR, "Error occurred when popen cmd 'nmcli connection show'");
+        qDebug()<<"Error occurred when popen cmd 'nmcli connection show";
     }
 
     while (fgets(buf, BUF_SIZE, p_file) != NULL) {
@@ -1273,8 +1273,8 @@ void MainWindow::onBtnNetListClicked(int flag)
 
         p_file = popen("nmcli connection show -active", "r");
         if (!p_file) {
-            syslog(LOG_ERR, "Error occured when popen cmd 'nmcli connection show'");
-            qDebug()<<"Error occured when popen cmd 'nmcli connection show";
+            syslog(LOG_ERR, "Error occurred when popen cmd 'nmcli connection show'");
+            qDebug()<<"Error occurred when popen cmd 'nmcli connection show";
         }
 
         while (fgets(buf, BUF_SIZE, p_file) != NULL) {

src/utils.cpp

@@ -91,8 +91,8 @@ int NetworkSpeed::getCurrentDownloadRates(char *netname, long *save_rate, long *
     }
 
     if ( (net_dev_file=fopen("/proc/net/dev", "r")) == NULL ){ //打开文件/pro/net/dev/，从中读取流量数据
-        qDebug()<<"error occured when try to open file /proc/net/dev/";
-        syslog(LOG_ERR, "error occured when try to open file /proc/net/dev/");
+        qDebug()<<"error occurred when try to open file /proc/net/dev/";
+        syslog(LOG_ERR, "error occurred when try to open file /proc/net/dev/");
         return -1;
     }
     memset(buffer,0,sizeof(buffer));