[Python-modules-commits] r29154 - in packages/pysubnettree/trunk/debian (9 files)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Fri May 30 19:26:42 UTC 2014


    Date: Friday, May 30, 2014 @ 19:26:41
  Author: kitterman
Revision: 29154

* New upstream release
  - Readd SubnetTree.i from git inadvertently omitted from tarball
  - Add build-depends on python{3}-setuptools to match upstream change
* Update debian/watch to point at pypi where the tarball is now found
* Bump standards version to 3.9.5 without further change
* Improve clean target
* Switch to source format 3.0 (quilt)

Added:
  packages/pysubnettree/trunk/debian/patches/Add_missing_SubnetTree.i.diff
  packages/pysubnettree/trunk/debian/patches/series
  packages/pysubnettree/trunk/debian/source/
  packages/pysubnettree/trunk/debian/source/format
Modified:
  packages/pysubnettree/trunk/debian/changelog
  packages/pysubnettree/trunk/debian/control
  packages/pysubnettree/trunk/debian/copyright
  packages/pysubnettree/trunk/debian/rules
  packages/pysubnettree/trunk/debian/watch

Modified: packages/pysubnettree/trunk/debian/changelog
===================================================================
--- packages/pysubnettree/trunk/debian/changelog	2014-05-29 15:10:16 UTC (rev 29153)
+++ packages/pysubnettree/trunk/debian/changelog	2014-05-30 19:26:41 UTC (rev 29154)
@@ -1,3 +1,15 @@
+pysubnettree (0.23-1) unstable; urgency=medium
+
+  * New upstream release
+    - Readd SubnetTree.i from git inadvertently omitted from tarball
+    - Add build-depends on python{3}-setuptools to match upstream change
+  * Update debian/watch to point at pypi where the tarball is now found
+  * Bump standards version to 3.9.5 without further change
+  * Improve clean target
+  * Switch to source format 3.0 (quilt)
+
+ -- Scott Kitterman <scott at kitterman.com>  Fri, 30 May 2014 14:17:31 -0400
+
 pysubnettree (0.22-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/pysubnettree/trunk/debian/control
===================================================================
--- packages/pysubnettree/trunk/debian/control	2014-05-29 15:10:16 UTC (rev 29153)
+++ packages/pysubnettree/trunk/debian/control	2014-05-30 19:26:41 UTC (rev 29154)
@@ -4,16 +4,21 @@
 Maintainer: Scott Kitterman <scott at kitterman.com>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
            Raúl Benencia <rul at kalgan.cc>
-Build-Depends: debhelper (>= 9), python-all-dev (>= 2.6.5-2~), python3-all-dev (>= 3.1.2-12~), swig
+Build-Depends: debhelper (>= 9),
+               python-all-dev (>= 2.6.5-2~),
+               python-setuptools,
+               python3-all-dev (>= 3.1.2-12~),
+               python3-setuptools,
+               swig
 X-Python-Version: >= 2.4
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://bro.org/download/README.pysubnettree.html
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pysubnettree/trunk
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pysubnettree/trunk/
 
 Package: python-subnettree
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Description: Python Module for CIDR Lookups
  The PySubnetTree package provides a Python data structure SubnetTree which
  maps subnets given in CIDR (Classless Inter-Domain Routing) notation to
@@ -22,10 +27,9 @@
 
 Package: python3-subnettree
 Architecture: any
-Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
 Description: Python3 Module for CIDR Lookups
  The PySubnetTree package provides a Python data structure SubnetTree which
  maps subnets given in CIDR (Classless Inter-Domain Routing) notation to
  Python3 objects. Lookups are performed by longest-prefix matching. It supports
  IPv6  addresses.
-

Modified: packages/pysubnettree/trunk/debian/copyright
===================================================================
--- packages/pysubnettree/trunk/debian/copyright	2014-05-29 15:10:16 UTC (rev 29153)
+++ packages/pysubnettree/trunk/debian/copyright	2014-05-30 19:26:41 UTC (rev 29154)
@@ -5,7 +5,7 @@
 Files: *
 Copyright: 1995-2013,  The Regents of the University of California through
                        the Lawrence Berkeley National Laboratory
-           1995-2013,  International Computer Science Institute. 
+           1995-2013,  International Computer Science Institute.
 License: BSD-3-clause
 
 Files: debian/*
@@ -51,20 +51,20 @@
 License: BSD-4-clause
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-  1.  Redistributions of source code must retain the above 
-      copyright notice, this list of conditions and the 
+  1.  Redistributions of source code must retain the above
+      copyright notice, this list of conditions and the
       following disclaimer.
-  2.  Redistributions in binary form must reproduce the above 
-      copyright notice, this list of conditions and the 
-      following disclaimer in the documentation and/or other 
+  2.  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.
-  3.  All advertising materials mentioning features or use of 
-      this software must display the following acknowledgement:  
+  3.  All advertising materials mentioning features or use of
+      this software must display the following acknowledgement:
   This product includes software developed by the University of Michigan, Merit
-  Network, Inc., and their contributors. 
+  Network, Inc., and their contributors.
   4.  Neither the name of the University, Merit Network, nor the
-      names of their contributors may be used to endorse or 
-      promote products derived from this software without 
+      names of their contributors may be used to endorse or
+      promote products derived from this software without
       specific prior written permission.
   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND ANY
   EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

Added: packages/pysubnettree/trunk/debian/patches/Add_missing_SubnetTree.i.diff
===================================================================
--- packages/pysubnettree/trunk/debian/patches/Add_missing_SubnetTree.i.diff	                        (rev 0)
+++ packages/pysubnettree/trunk/debian/patches/Add_missing_SubnetTree.i.diff	2014-05-30 19:26:41 UTC (rev 29154)
@@ -0,0 +1,16 @@
+Description: Upstream omitted SubnetTree.i from the tarball, adding it back
+Author: Scott Kitterman <scott at kitterman.com>
+Origin: upstream
+Forwarded: not-needed
+Last-Update: 2014-05-30
+
+--- /dev/null
++++ pysubnettree-0.23/SubnetTree.i
+@@ -0,0 +1,7 @@
++%module SubnetTree
++%{
++  #include "SubnetTree.h"
++%}
++      
++%include "SubnetTree.h"
++

Added: packages/pysubnettree/trunk/debian/patches/series
===================================================================
--- packages/pysubnettree/trunk/debian/patches/series	                        (rev 0)
+++ packages/pysubnettree/trunk/debian/patches/series	2014-05-30 19:26:41 UTC (rev 29154)
@@ -0,0 +1 @@
+Add_missing_SubnetTree.i.diff

Modified: packages/pysubnettree/trunk/debian/rules
===================================================================
--- packages/pysubnettree/trunk/debian/rules	2014-05-29 15:10:16 UTC (rev 29153)
+++ packages/pysubnettree/trunk/debian/rules	2014-05-30 19:26:41 UTC (rev 29154)
@@ -24,4 +24,6 @@
 
 override_dh_clean:
 	dh_clean
+	-cp -f $(CURDIR)/not.SubnetTree_wrap.cc $(CURDIR)/SubnetTree_wrap.cc
+	rm -f $(CURDIR)/not.SubnetTree_wrap.cc
 	rm -rf $(CURDIR)/build

Added: packages/pysubnettree/trunk/debian/source/format
===================================================================
--- packages/pysubnettree/trunk/debian/source/format	                        (rev 0)
+++ packages/pysubnettree/trunk/debian/source/format	2014-05-30 19:26:41 UTC (rev 29154)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: packages/pysubnettree/trunk/debian/watch
===================================================================
--- packages/pysubnettree/trunk/debian/watch	2014-05-29 15:10:16 UTC (rev 29153)
+++ packages/pysubnettree/trunk/debian/watch	2014-05-30 19:26:41 UTC (rev 29154)
@@ -1,3 +1,2 @@
 version=3
-http://www.bro.org/download/index.html \
-  http://www.bro.org/downloads/release/pysubnettree-(.*)\.tar\.gz
+https://pypi.python.org/packages/source/p/pysubnettree/pysubnettree-([0-9.]+).tar.gz




More information about the Python-modules-commits mailing list