From 014628e2e93d4cad9f88753b3f97d8f2c1c20e78 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Fri, 25 Apr 2014 11:15:36 +0200 Subject: [PATCH] merge from debian packaging --- debian/changelog | 28 +++++++++++++++++++++------- debian/control | 6 +++--- debian/copyright | 8 ++++---- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 331a28e..fef965f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,27 @@ -psensor (0.8.0.5-1ppatrusty1) trusty; urgency=low +psensor (0.8.0.6-1ppatrusty1) trusty; urgency=low - * New upstream release. + * Bump trusty PPA -- Jean-Philippe Orsini Fri, 11 Apr 2014 08:54:21 +0200 -psensor (0.8.0.4-1) saucy; urgency=low +psensor (0.8.0.6-1) unstable; urgency=low + + * New upstream release. + + fixed AppIndicator icons. (LP: #1290072) + + removed webfont to fix lintian warning privacy-breach-generic. + + fixed lintian warning source-is-missing due to minimized .js. + * debian/control + + switched to Standards-Version 3.9.5. + + fixed indentation of build-depends section. + + changed vcs headers, packaging maintained in git now. + * debian/copyright + + psensor/packaging copyright end date set to 2014. + + jqplot (updated upstream) copyright end date set to 2013. + + excanvas.js (removed upstream) copyright removed. + + -- Jean-Philippe Orsini Tue, 15 Apr 2014 03:40:40 -0400 + +psensor (0.8.0.4-1) unstable; urgency=low * New upstream release. * debian/control @@ -23,10 +40,7 @@ psensor (0.8.0.4-1) saucy; urgency=low * debian/psensor-common.doc-base.manual + registered to doc-base. * debian/rules - + regenerate config.{guess,sub} automaticaly. (Closes: #727950) - * Merge from Debian unstable, remaining Ubuntu changes: - - Build depend on nvidia-settings build-dep on i386 and amd64. - - Build depend on libunity-dev and libappindicator3-dev for Unity support. + + regenerate config.{guess,sub} automatically. (Closes: #727950) -- Jean-Philippe Orsini Fri, 20 Sep 2013 19:39:45 -0400 diff --git a/debian/control b/debian/control index 241eda3..9f47fed 100644 --- a/debian/control +++ b/debian/control @@ -25,9 +25,9 @@ Build-Depends: asciidoc, libunity-dev, nvidia-settings [i386 amd64], perl -Standards-Version: 3.9.4 -Vcs-Browser: http://wpitchoune.net/svnpub/packages/ubuntu/psensor/trunk -Vcs-Svn: http://wpitchoune.net/svnpub/packages/ubuntu/psensor/trunk +Standards-Version: 3.9.5 +Vcs-Browser: http://wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git +Vcs-Git: git://git.wpitchoune.net/psensor-pkg-ubuntu.git Homepage: http://wpitchoune.net/psensor Package: psensor diff --git a/debian/copyright b/debian/copyright index eadf39c..d0808ba 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,7 @@ It was downloaded from: http://wpitchoune.net/psensor Upstream Author: Jean-Philippe Orsini Copyright: - Copyright (C) 2010-2013 by Jean-Philippe Orsini + Copyright (C) 2010-2014 by Jean-Philippe Orsini License: @@ -28,12 +28,12 @@ On Debian/Ubuntu systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. Packaging: - Copyright (C) 2010-2013 by Jean-Philippe Orsini + Copyright (C) 2010-2014 by Jean-Philippe Orsini released under GNU General Public License version 2. The following files are distributed under their own terms: -www/{excanvas.js,jqplot.css,jqplot.dateAxisRenderer.js,jqplot.js}: - Copyright (c) 2009-2011 Chris Leonello +www/{jqplot.css,jqplot.dateAxisRenderer.js,jqplot.js}: + Copyright (c) 2009-2013 Chris Leonello Dual licensed under the MIT and GNU General Public License version 2 -- 2.7.4