[SCM] advene/master: Fix lintian warnings

oaubert-guest at users.alioth.debian.org oaubert-guest at users.alioth.debian.org
Thu Oct 12 20:45:54 UTC 2017


The following commit has been merged in the master branch:
commit 8bb4845f9436522d99643563d7aace295479d19e
Author: Olivier Aubert <contact at olivieraubert.net>
Date:   Thu Oct 12 19:04:16 2017 +0200

    Fix lintian warnings
    
    update to Standards 4.1.1

diff --git a/debian/advene.desktop b/debian/advene.desktop
index 11a21ee..37e26d6 100644
--- a/debian/advene.desktop
+++ b/debian/advene.desktop
@@ -2,11 +2,11 @@
 Name=Advene Video annotation
 Comment=Annotate Digital Video, Exchange on the NEt
 Comment[fr]=Annotations de vidéo numérique échangées sur le NEt
-Exec=advene
+Exec=advene %F
 Terminal=false
 Type=Application
 Icon=/usr/share/advene/pixmaps/icon_advene32.png
+Keywords[en]=hypervideo;
 Categories=GTK;AudioVideo;Player;
 MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/ogg;video/x-mpeg;video/x-mpeg2;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-theora;video/x-matroska;
 StartupNotify=true
-
diff --git a/debian/advene.menu b/debian/advene.menu
deleted file mode 100644
index 34e072b..0000000
--- a/debian/advene.menu
+++ /dev/null
@@ -1,10 +0,0 @@
-?package(advene):\
-	needs="X11"\
-	section="Applications/Video"\
-	title="Advene"\
-	longtitle="Advene - Video annotation"\
-	command="/usr/bin/advene" \
-	hints="Video" \
-	icon="/usr/share/advene/pixmaps/icon_advene32.xpm" \
-	icon32x32="/usr/share/advene/pixmaps/icon_advene32.xpm" \
-  	icon16x16="/usr/share/advene/pixmaps/icon_advene16.xpm"
diff --git a/debian/control b/debian/control
index b5f6d98..5defb06 100644
--- a/debian/control
+++ b/debian/control
@@ -6,14 +6,14 @@ Uploaders:
  Olivier Aubert <contact at olivieraubert.net>
 Build-Depends:
  cdbs (>= 0.4.49),
- debhelper (>= 9),
+ debhelper (>= 10),
  dh-python,
  python3-all (>= 3.4.0),
  python3-setuptools
 X-Python3-Version: >= 3.4
-Standards-Version: 3.9.5
-Vcs-Git: git://anonscm.debian.org/pkg-multimedia/advene.git
-Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/advene.git
+Standards-Version: 4.1.1
+Vcs-Git: https://anonscm.debian.org/pkg-multimedia/advene.git
+Vcs-Browser: https://git.debian.org/pkg-multimedia/advene.git
 Homepage: http://www.advene.org/
 
 Package: advene
diff --git a/debian/copyright b/debian/copyright
index 099f51d..0c7e7f1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -186,10 +186,11 @@ Comment:
  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: LGPL-2.1
+License: LGPL-2.1+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation, version 2.1 of the License.
+ the Free Software Foundation, either version 2.1 of the License, or
+ (at your option) any later version.
  .
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -202,17 +203,6 @@ Comment:
  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: MPL1.1
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "MPL"); you may not use this file except in
- compliance with the MPL.  You may obtain a copy of the MPL at
- http://www.mozilla.org/MPL/
- .
- Software distributed under the MPL is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the MPL
- for the specific language governing rights and limitations under the
- MPL.
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2

-- 
advene packaging



More information about the pkg-multimedia-commits mailing list