Package: release.debian.org
Severity: normal

wheezy currently has 1.3.4-5

I've just built 1.3.4-6.

I believe the changes (from changelog, debdiff attached) qualify for
unblock as they are documentation changes:

  * Add VCS locations to control file.
  * Update copyright file to DEP-5 format, clarify BSD terms
  * Upstream move to github (update home page and watch file)

Please confirm when I can upload to unstable

The change can be reviewed in git too:

Vcs-Git: git://git.debian.org/collab-maint/ganglia-modules-linux.git

Vcs-Browser:
http://git.debian.org/?p=collab-maint/ganglia-modules-linux.git;a=summary

diff -Nru ganglia-modules-linux-1.3.4/debian/changelog 
ganglia-modules-linux-1.3.4/debian/changelog
--- ganglia-modules-linux-1.3.4/debian/changelog        2012-04-23 
08:29:51.000000000 +0000
+++ ganglia-modules-linux-1.3.4/debian/changelog        2012-11-05 
13:54:03.000000000 +0000
@@ -1,3 +1,11 @@
+ganglia-modules-linux (1.3.4-6) unstable; urgency=low
+
+  * Add VCS locations to control file.
+  * Update copyright file to DEP-5 format, clarify BSD terms
+  * Upstream move to github (update home page and watch file)
+
+ -- Daniel Pocock <dan...@pocock.com.au>  Mon, 05 Nov 2012 14:53:57 +0100
+
 ganglia-modules-linux (1.3.4-5) unstable; urgency=low
 
   * Eliminate issues relating to ganglia-monitor
diff -Nru ganglia-modules-linux-1.3.4/debian/control 
ganglia-modules-linux-1.3.4/debian/control
--- ganglia-modules-linux-1.3.4/debian/control  2012-04-19 19:01:06.000000000 
+0000
+++ ganglia-modules-linux-1.3.4/debian/control  2012-11-05 13:51:53.000000000 
+0000
@@ -5,9 +5,9 @@
 Uploaders: Stuart Teasdale <s...@debian.org>
 Build-Depends: cdbs, debhelper (>= 7.0.50~), autotools-dev, libganglia1-dev 
(>= 3.3.5), libconfuse-dev, libapr1-dev
 Standards-Version: 3.9.3
-Homepage: https://sourceforge.net/projects/gmod-linux
-#Vcs-Git: git://git.debian.org/collab-maint/ganglia-modules-linux.git
-#Vcs-Browser: 
http://git.debian.org/?p=collab-maint/ganglia-modules-linux.git;a=summary
+Homepage: https://github.com/ganglia/ganglia-modules-linux
+Vcs-Git: git://git.debian.org/collab-maint/ganglia-modules-linux.git
+Vcs-Browser: 
http://git.debian.org/?p=collab-maint/ganglia-modules-linux.git;a=summary
 
 Package: ganglia-modules-linux
 Architecture: any
diff -Nru ganglia-modules-linux-1.3.4/debian/copyright 
ganglia-modules-linux-1.3.4/debian/copyright
--- ganglia-modules-linux-1.3.4/debian/copyright        2012-04-13 
19:51:23.000000000 +0000
+++ ganglia-modules-linux-1.3.4/debian/copyright        2012-11-05 
14:07:01.000000000 +0000
@@ -1,39 +1,64 @@
-
-    Packaged by:
-
-    Daniel Pocock <dan...@pocock.com.au> on Fri, 30 Dec 2011 14:33:04 +0100
-
-    https://sourceforge.net/projects/gmod-linux
-
-    based on a compilation of contributions from the Ganglia community
-    http://ganglia.info
-
-    mod_io:
-    Copyright 2008 JB Kim (original work BSD license)
-    Copyright 2011 Daniel Pocock (adapted to DSO, GPL3 license)
-
-    mod_example:
-    Copyright 2007 Brad Nicholes, Novell (BSD license)
-
-    mod_multicpu:
-    Copyright 2007 Brad Nicholes, Novell (BSD license)
-    Copyright 2011 Daniel Pocock (enhancements, GPL3 license)
-
-    mod_fs:
-    Copyright 2012 Daniel Pocock (GPL3 license)
-
-    Overall compilation and build system:
-    Copyright (C) 2011 Daniel Pocock
-    Please see the package copyright notice for further copyright details
-
-    The software is licensed under the terms of the GNU General
-    Public License version 3.  On Debian systems, the complete text
-    of the GNU General Public License version 3 can be found in
-    /usr/share/common-licenses/GPL-3
-
-    Debian packaging is:
-
-    Copyright (C) 2011 Daniel Pocock <dan...@pocock.com.au>
-
-    and is licensed under the GPL version 3, see above.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ganglia-modules-linux
+Upstream-Contact: ganglia developers <ganglia-develop...@lists.sourceforge.net>
+Source: git://github.com/ganglia/ganglia-modules-linux.git
+
+Files: *
+Copyright: 2011-2012, Daniel Pocock <dan...@pocock.com.au>
+License: GPL-3
+
+Files: io/*
+Copyright: 2008, JB Kim
+           2011-2012, Daniel Pocock <dan...@pocock.com.au>
+License: GPL-3
+
+Files: example/*
+Copyright: 2007, Novell
+License: BSD-Novell
+
+Files: multicpu/*
+Copyright: 2007, Novell
+           2011-2012, Daniel Pocock <dan...@pocock.com.au>
+License: GPL-3
+
+Files: fs/*
+Copyright: 2012, Daniel Pocock <dan...@pocock.com.au>
+License: GPL-3
+
+Files: debian/*
+Copyright: 2011-2012, Daniel Pocock <dan...@pocock.com.au>
+License: GPL-3
+
+License: GPL-3
+ The GPL-3 can be found in /usr/share/common-licenses/GPL-3 on your
+ Debian system.
+
+License: BSD-Novell
+ Portions Copyright (C) 2007 Novell, Inc. All rights reserved.
+ .
+ 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 Novell, Inc. nor the names of its
+    contributors may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL Novell, Inc. OR THE CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
 
diff -Nru ganglia-modules-linux-1.3.4/debian/watch 
ganglia-modules-linux-1.3.4/debian/watch
--- ganglia-modules-linux-1.3.4/debian/watch    2012-04-10 15:57:23.000000000 
+0000
+++ ganglia-modules-linux-1.3.4/debian/watch    2012-05-24 18:40:27.000000000 
+0000
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/gmod-linux/ganglia-modules-linux-(.+)\.tar\.gz
+https://github.com/ganglia/ganglia-modules-linux/tags .*/tarball/(\d[\d\.]+)

Reply via email to