[SCM] smtube/master: New upstream release [15.5.10] + changelog summary

Tue May 19 11:36:52 UTC 2015

The following commit has been merged in the master branch:
commit f7f648dbcf2e172967a0c092bcd7149a24a58e40
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Tue May 19 19:51:48 2015 +1000

    New upstream release [15.5.10] + changelog summary

diff --git a/debian/changelog b/debian/changelog
index 6c69a43..e79e53c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+smtube (15.5.10-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release [May 2015] (Closes: #785142).
+  * Build-Depends += "libqtwebkit-dev".
+  * Added new "hardening.patch".
+  * rules: remove upstream Changelog, if empty.
+  * Updated Vcs-Browser URL.
+  * Standards-Version: 3.9.6.
+
+ -- Dmitry Smirnov <onlyjob at debian.org>  Tue, 19 May 2015 19:38:34 +1000
+
 smtube (14.8.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 6022184..4782f41 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders:
 Build-Depends:
  debhelper (>= 9~),
  libqt4-dev (>= 4.3),
+ libqtwebkit-dev,
  zlib1g-dev
 Standards-Version: 3.9.6
 Homepage: http://smplayer.sourceforge.net/smtube.php
diff --git a/debian/copyright b/debian/copyright
index 676e7fb..cdde617 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,23 +6,9 @@ Source: http://sf.net/projects/smplayer/files/
 Files: *
 Copyright:
   2010 Ori Rejwan
-  2012-2013 Ricardo Villalba <rvm at users.sourceforge.net>
+  2006-2015 Ricardo Villalba <rvm at users.sourceforge.net>
 License: GPL-2+
 
-Files:
- src/qtsingleapplication/qtlocalpeer.cpp
- src/qtsingleapplication/qtlocalpeer.h
- src/qtsingleapplication/qtlockedfile.cpp
- src/qtsingleapplication/qtlockedfile.h
- src/qtsingleapplication/qtlockedfile_unix.cpp
- src/qtsingleapplication/qtlockedfile_win.cpp
- src/qtsingleapplication/qtsingleapplication.cpp
- src/qtsingleapplication/qtsingleapplication.h
- src/qtsingleapplication/qtsinglecoreapplication.cpp
- src/qtsingleapplication/qtsinglecoreapplication.h
-Copyright: 2010, Nokia Corporation
-License: BSD-3-clause
-
 Files: debian/*
 Copyright: 2013-2014 Alessio Treglia <alessio at debian.org>
 License: GPL-2+
@@ -43,30 +29,3 @@ License: GPL-2+
  .
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-   * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in
-     the documentation and/or other materials provided with the
-     distribution.
-   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-     the names of its contributors may be used to endorse or promote
-     products derived from this software without specific prior written
-     permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..235baa9
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,22 @@
+Last-Update: 2015-05-19
+Forwarded: not-needed
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Description: Hardening
+
+--- a/src/smtube.pro
++++ b/src/smtube.pro
+@@ -4,8 +4,14 @@
+ 
+ CONFIG += release
+ #CONFIG += debug
+ 
++## https://wiki.debian.org/Hardening#Notes_for_packages_using_QMake
++QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS)
++QMAKE_CFLAGS   *= $(shell dpkg-buildflags --get CFLAGS)
++QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS)
++QMAKE_LFLAGS   *= $(shell dpkg-buildflags --get LDFLAGS)
++
+ DEFINES += USE_PLAYERS
+ DEFINES += YT_USE_SCRIPT
+ 
+ isEqual(QT_MAJOR_VERSION, 5) {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..814900f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+hardening.patch
diff --git a/debian/rules b/debian/rules
index adc12b3..48e4314 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,9 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	dh_auto_install -- $(MAKE_OPTS) DOC_PATH=/usr/share/doc/smtube
-	rm -f debian/smtube/usr/share/doc/smtube/Copying*
+	$(RM) -v debian/smtube/usr/share/doc/smtube/Copying*
+	## remove Changelog, if empty:
+	[ -s debian/smtube/usr/share/doc/smtube/Changelog ] || $(RM) -v debian/smtube/usr/share/doc/smtube/Changelog
 
 %:
 	dh $@

-- 
smtube packaging

