[SCM] freetuxtv/master: Update package description (fix #813192)

ebeuque-guest at users.alioth.debian.org ebeuque-guest at users.alioth.debian.org
Tue May 24 16:57:40 UTC 2016


The following commit has been merged in the master branch:
commit 47142a6516777be26b6fd67530f8c14035c72256
Author: Eric Beuque <eric.beuque at gmail.com>
Date:   Tue May 24 17:56:12 2016 +0100

    Update package description (fix #813192)

diff --git a/debian/README.source b/debian/README.source
index b083ed8..50ee78d 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -9,7 +9,7 @@ freetuxtv for Debian
     Note that _none.png was created by the upstream author and is thus retained.
     
     Instructions for importing new upstream releases:
-        1) Import the contents of the upstream tarball into upstream branch:
+        1) Import the contents of the upstream tarball into upstream branch (git checkout upstream):
             git-import-orig --no-merge --pristine-tar --sign-tags <TARBALL_PATH>
         2) Switch to dfsg_clean branch and import new upstream release:
             git checkout dfsg_clean && git merge upstream
@@ -27,4 +27,4 @@ freetuxtv for Debian
             git-buildpackage --git-pristine-tar-commit \
                     --git-upstream-tree=dfsg_clean/X.Y.Z --git-builder=""
 
- -- Ryan Kavanagh <rak at debian.org>  Thu, 10 May 2012 07:35:08 -0400
+ -- Ryan Kavanagh <rak at debian.org>  Thu, 10 May 2012 07:35:08 -0400
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index ae05bf5..eed06ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 freetuxtv (0.6.8~dfsg1-1) unstable; urgency=medium
 
-  *
+  [Eric Beuque]
+  * Upgrade to upstream 0.6.8
+    + Fix icons from bad them (Closes: #787351)
+    + Fix crash at startup (Closes: #819307, #772845)
+  * Update package description (Closes: #813192)
 
  -- Eric Beuque <ebeuque at debian>  Tue, 24 May 2016 18:49:41 +0200
 
diff --git a/debian/control b/debian/control
index e4bcb26..14bbcac 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 9.0.0),
  autotools-dev,
  intltool,
  libtool,
+ libtool-bin,
  libgtk-3-dev | libgtk2.0-dev (>= 2.22),
  libglib2.0-dev,
  libdbus-glib-1-dev,
@@ -15,7 +16,7 @@ Build-Depends: debhelper (>= 9.0.0),
  libcurl4-openssl-dev,
  libnotify-dev
 Standards-Version: 3.9.5
-Homepage: http://code.google.com/p/freetuxtv/
+Homepage: https://github.com/freetuxtv/freetuxtv
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/freetuxtv.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/freetuxtv.git
 
@@ -29,4 +30,4 @@ Description: Internet television and radio player
  WebCam channels in more than 20 languages, along with television services
  provided by ISPs to their subscribers.
  .
- It relies on VLC for its multimedia codecs.
+ It relies on VLC for its multimedia codecs.
\ No newline at end of file
diff --git a/debian/copyright b/debian/copyright
index 9a53637..9ccf0a6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: freetuxtv
-Source: http://code.google.com/p/freetuxtv/
+Source: https://github.com/freetuxtv/freetuxtv
 
 Files: *
-Copyright: 2012, 2013, 2014 Eric Beuque <eric.beuque at gmail.com>
+Copyright: 2012, 2013, 2014, 2015, 2016 Eric Beuque <eric.beuque at gmail.com>
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -135,4 +135,4 @@ License: GPL-3+
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+ Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
\ No newline at end of file
diff --git a/debian/watch b/debian/watch
index 34e682d..2124eae 100644
--- a/debian/watch
+++ b/debian/watch
@@ -3,4 +3,4 @@ version=3
 
 # Find new files on GoogleCode
 opts=dversionmangle=s/(\~dfsg[\d]*)?$// \
-http://code.google.com/p/freetuxtv/downloads/list?can=1 .*/freetuxtv-(\d[\d\.]*)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz)
+https://github.com/freetuxtv/freetuxtv/releases .*/freetuxtv-(\d[\d\.]*)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz)
\ No newline at end of file

-- 
freetuxtv packaging



More information about the pkg-multimedia-commits mailing list