[Pkg-nagios-changes] [pkg-nagvis] 04/04: Updated copyright information and README.source
Markus Frosch
lazyfrosch-guest at moszumanska.debian.org
Thu Dec 19 21:07:27 UTC 2013
This is an automated email from the git hooks/post-receive script.
lazyfrosch-guest pushed a commit to branch master
in repository pkg-nagvis.
commit 618ecebd8698c2ebb4d93cd33391938a93c945f9
Author: Markus Frosch <markus at lazyfrosch.de>
Date: Thu Dec 19 22:06:57 2013 +0100
Updated copyright information and README.source
---
debian/README.source | 11 ++++--
debian/copyright | 108 ++++++++++++++++-----------------------------------
debian/rules | 10 +----
3 files changed, 44 insertions(+), 85 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index 6076650..0bc4867 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,9 +1,14 @@
nagvis for Debian
-----------------
-This package uses quilt as patch management. More details on its usage may
-be found in /usr/share/doc/quilt/README.source after installing the quilt
-package.
+ The original upstream tarball contains some swf files, for which the
+ source is present, but for which we miss the needed tools to build them
+ from source.
+ We therefore had to remove the following files from the upstream tarball:
+ uifx/
+ share/netmap/shell.swf
+ share/netmap/shell.html (referencing shell.swf and otherwise emmpty)
+ share/netmap/modules/gmap/
diff --git a/debian/copyright b/debian/copyright
index bed5478..89a440e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,61 +1,39 @@
-This work was packaged for Debian by:
-
- Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org> on Wed, 22 Feb 2012 15:22:51 +0100
-
-It was downloaded from:
-
- http://www.nagvis.org/downloads
-
-Upstream Authors:
-
- NagVis Project
- Lars Michelsen <lars at vertical-visions.de>
- Michael Luebben <mickey2002 at nagios-wiki.de>
-
-Copyright:
-
- 2007 Lars Michelsen <lars at vertical-visions.de>
- 2007 Michael Luebben <mickey2002 at nagios-wiki.de>
-
-License:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
-
- 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 <http://www.gnu.org/licenses/>
-
-On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-
-Removed files:
-
- The original upstream tarball contains some swf files, for which the
- source is present, but for which we miss the needed tools to build them
- from source.
-
- We therefore had to remove the following files from the upstream tarball:
-
- uifx/
- share/netmap/shell.swf
- share/netmap/shell.html (referencing shell.swf and otherwise emmpty)
- share/netmap/modules/gmap/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: NagVis
+Source: http://sourceforge.net/projects/nagvis/files/
+
+Files: *
+Copyright: Copyright 2007-2013, Lars Michelsen <lars at vertical-visions.de>
+ Copyright 2007, Michael Luebben <mickey2002 at nagios-wiki.de>
+ and contributors
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+ .
+ 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.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2"
+Files: debian/*
+Copyright: Copyright 2007-2012, Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
+ Copyright 2009, Alexander Wirt <formorer at debian.org>
+ Copyright 2009, Jan Wagner <waja at debian.org>
+ Copyright 2011-2012, Alexander Reichle-Schmehl <tolimar at debian.org>
+ Copyright 2013, Markus Frosch <markus at lazyfrosch.de>
+ and contributors
+License: GPL-2+
Files: share/frontend/nagvis-js/ext/dwoo-1.1.0/*
Copyright: (c) 2008, Jordi Boggiano
License: BSD
Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
-met:
- .
+ 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
@@ -81,14 +59,14 @@ Copyright: (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
License: BSD
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 Zend Technologies USA, Inc. nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
@@ -104,27 +82,9 @@ License: BSD
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
Files: share/server/core/ext/php-gettext-1.0.9/*
Copyright: 2005 Steven Armstrong <sa at c-area dot ch>
2003, 2005, 2006, 2009 Danilo Segan <danilo at kvota.net>
2005 Nico Kaiser <nico at siriux.net>
-License: GPLv2+
- 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.
- .
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
-
-
-The Debian packaging is:
-
- Copyright (C) 2012 Alexander Reichle-Schmehl <tolimar at debian.org>
-
-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.
+License: GPL-2+
diff --git a/debian/rules b/debian/rules
index 678891a..98d7f7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,10 @@
#!/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 DH_VERBOSE=1
%:
- dh --with quilt $@
+ dh $@
override_dh_install:
dh_install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagvis.git
More information about the Pkg-nagios-changes
mailing list