From 21fc76ce1d6c85001551c00e449f9694b1f9fba8 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Mon, 1 Sep 2014 17:52:45 +0200 Subject: [PATCH] new 1.1.1 release. merged from debian packaging. --- debian/changelog | 28 ++++++++------- debian/control | 2 +- debian/copyright | 96 ++++++++++++++++++++++++++++++-------------------- debian/psensor.install | 1 - debian/rules | 8 ----- 5 files changed, 73 insertions(+), 62 deletions(-) diff --git a/debian/changelog b/debian/changelog index 85aeca3..f1dad00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,25 +1,27 @@ psensor (1.1.1-1ppatrusty1) trusty; urgency=medium - * New usptream release. - - -- Jean-Philippe Orsini Mon, 01 Sep 2014 15:56:24 +0200 - -psensor (1.0.4-1ppatrusty1) trusty; urgency=medium - * New upstream release. - -- Jean-Philippe Orsini Wed, 13 Aug 2014 20:20:02 +0200 + -- Jean-Philippe Orsini Mon, 01 Sep 2014 17:50:19 +0200 -psensor (1.0.3-1ppatrusty1) trusty; urgency=medium +psensor (1.0.4-1) unstable; urgency=medium * New upstream release. - + Fixed psensor does not start: Attempt to unlock mutex that was - not locked during startup with glib 2.41.2. (LP: #1346299). - + Fixed FTBFS with clang instead of gcc. (Closes: #753061). + + fixed psensor does not start: Attempt to unlock mutex that was not + locked during startup with glib 2.41.2. (LP: #1346299) + + fixed FTBFS with clang instead of gcc. (Closes: #753061) + * debian/control + + added build dep to libappindicator3-dev. + + switched to optional priority instead of extra. + + removed useless dots after long descriptions. + * debian/rules + + removed useless comments. + * debian/copyright + + switched to copyright format 1.0. - -- Jean-Philippe Orsini Tue, 05 Aug 2014 18:49:07 +0200 + -- Jean-Philippe Orsini Wed, 06 Aug 2014 18:36:41 -0400 -psensor (1.0.2-1ppatrusty1) trusty; urgency=low +psensor (1.0.2-1) unstable; urgency=low * New upstream release. + fixed AppIndicator icons. (LP: #1290072) (LP: #1310323) diff --git a/debian/control b/debian/control index 3471ed9..61f13f1 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: psensor Section: utils -Priority: extra +Priority: optional Maintainer: Jean-Philippe Orsini Build-Depends: asciidoc, autoconf, diff --git a/debian/copyright b/debian/copyright index d0808ba..b34d328 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,39 +1,57 @@ -This package was debianized by Jean-Philippe Orsini -Tue, 15 Feb 18:33:41 CET 2011. - -It was downloaded from: http://wpitchoune.net/psensor - -Upstream Author: Jean-Philippe Orsini - -Copyright: - Copyright (C) 2010-2014 by Jean-Philippe Orsini - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 dated June, 1991. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301, USA. - -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-2014 by Jean-Philippe Orsini - released under GNU General Public License version 2. - - -The following files are distributed under their own terms: - -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 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: psensor +Upstream-Contact: Jean-Philippe Orsini +Source: http://wpitchoune.net/psensor + +Files: * +Copyright: 2010-2014 Jean-Philippe Orsini +License: GPL-2.0 + +Files: www/jqplot.css www/jqplot.dateAxisRenderer.js www/jqplot.js +Copyright: 2009-2013 Chris Leonello +License: GPL-2.0 or MIT + +Files: www/jquery.js +Copyright: 2005-2012 jQuery Foundation, Inc. and other contributors +License: MIT + +Files: debian/* +Copyright: 2010-2014 Jean-Philippe Orsini +License: GPL-2.0 + +License: GPL-2.0 + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/debian/psensor.install b/debian/psensor.install index c39a414..5189d5d 100644 --- a/debian/psensor.install +++ b/debian/psensor.install @@ -1,4 +1,3 @@ -/etc/gconf/schemas/psensor.schemas /usr/bin/psensor /usr/share/applications /usr/share/icons diff --git a/debian/rules b/debian/rules index 1a9bfb1..5b84297 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,5 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 %: -- 2.7.4