Fix some lintian warings and update changelog

UbuntuKylin · Aug 12, 2019 · da74698 · da74698
1 parent 33fbbc4
commit da74698
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 21 deletions.
diff --git a/NEWS b/NEWS
@@ -3,7 +3,7 @@ Version  2.0.0
 ==============
 
 - Updated these modules: preferences, core, mplayerprocess and mpvprocess.
-- Rewrited playlist with model and delegate.
+- Rewrote playlist with model and delegate.
 - Added OSD info.
 - Optimized partial parameters for mpv and mplayer.
 - Supported Interface Size Tension.

diff --git a/debian/changelog b/debian/changelog
@@ -1,27 +1,26 @@
-kylin-video (2.0.0-0ubuntu2) eoan; urgency=low
+kylin-video (2.0.0-1) unstable; urgency=medium
 
   * Supported Interface Size Tension.
-  * Added new files, such as videowindow.cpp, autohidecursorwidget.cpp and 
-    displaylayercomposer.cpp.
+  * Added new files, such as videowindow.cpp, autohidecursorwidget.cpp
+    and displaylayercomposer.cpp.
   * Add remote controller dbus.
   * Add equalizer and filter for audio.
   * Fixed the exception of the esctip.
   * Access icon from theme.
-  * Modified the path of translated pm files and the timing of generation.
-
- -- lixiang <lixiang@kylinos.cn>  Mon, 22 Jul 2019 10:51:05 +0800
-
-kylin-video (2.0.0-0ubuntu1) disco; urgency=low
-
-  * Updated these modules: preferences, core, mplayerprocess and mpvprocess.
-  * Rewrited playlist with model and delegate.
+  * Modified the path of translated pm files and the timing of
+    generation.
+  * Updated these modules: preferences, core, mplayerprocess and
+    mpvprocess.
+  * Rewrote playlist with model and delegate.
   * Added OSD info.
   * Optimized partial parameters for mpv and mplayer.
   * Debian/control:
     - Add qtbase5-private-dev and libcrystalhd-dev to build-depends.
     - Add libcrystalhd3 | firmware-crystalhd to depends.
+    - Bump standards vertion to 4.4.0.
+    - Bump compat level to 12.
 
- -- handsome_feng <jianfengli@ubuntukylin.com>  Tue, 16 Apr 2019 20:00:09 +0800
+ -- handsome_feng <jianfengli@ubuntukylin.com>  Mon, 12 Aug 2019 15:10:39 +0800
 
 kylin-video (1.1.7-1) unstable; urgency=low
 

diff --git a/debian/compat b/debian/compat
@@ -1 +1 @@
-11
+12
diff --git a/debian/control b/debian/control
@@ -4,9 +4,7 @@ Priority: optional
 Maintainer: Kylin Team <team+kylin@tracker.debian.org>
 Uploaders: Aron Xu <aron@debian.org>,
            handsome_feng <jianfengli@ubuntukylin.com>,
-           lixiang <xiangli@ubuntukylin.com>
 Build-Depends: debhelper (>= 12),
-               build-essential,
                qtbase5-dev (>= 5.1),
                qt5-qmake,
                qtchooser,
@@ -18,7 +16,7 @@ Build-Depends: debhelper (>= 12),
                libx11-dev,
                libcrystalhd-dev [amd64 i386],
                zlib1g-dev,
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
 Homepage: https://github.com/ukui/kylin-video
 Vcs-Git: https://github.com/ukui/kylin-video.git
 Vcs-Browser: https://github.com/ukui/kylin-video

diff --git a/debian/rules b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export QT_SELECT=5
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 QMAKE_OPTS = DEFINES+=NO_DEBUG_ON_CONSOLE
 MAKE_OPTS  = PREFIX=/usr QMAKE=qmake LRELEASE=lrelease QMAKE_OPTS="$(QMAKE_OPTS)"

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -2091,9 +2091,9 @@ void MainWindow::displayVideoInfo(int width, int height, double fps)
 //	format_info_display->setText(format.toUpper());
 }
 
-void MainWindow::displayBitrateInfo(int vbitrate, int abitrate)
+void MainWindow::displayBitrateInfo(int vbitrate, int arbitrate)
 {
-//	bitrate_info_display->setText(tr("V: %1 kbps A: %2 kbps").arg(vbitrate/1000).arg(abitrate/1000));
+//	bitrate_info_display->setText(tr("V: %1 kbps A: %2 kbps").arg(vbitrate/1000).arg(arbitrate/1000));
 }
 
 void MainWindow::newMediaLoaded()

diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -170,7 +170,7 @@ public slots:
     void newMediaLoaded();
     void updateMediaInfo();
     void displayVideoInfo(int width, int height, double fps);
-    void displayBitrateInfo(int vbitrate, int abitrate);
+    void displayBitrateInfo(int vbitrate, int arbitrate);
 	void gotNoFileToPlay();
 	void gotForbidden();
     void enableActionsOnPlaying();

diff --git a/src/smplayer/core.h b/src/smplayer/core.h
@@ -472,7 +472,7 @@ protected slots:
 	void newDuration(double); // Duration has changed
 	void showFrame(int frame);
 	void ABMarkersChanged(int secs_a, int secs_b);
-    void bitrateChanged(int vbitrate, int abitrate);
+    void bitrateChanged(int vbitrate, int arbitrate);
 	void needResize(int w, int h);
 	void noVideo();
 	void volumeChanged(int);