Merging in James Page's packaging tweaks for quantal.

2012-07-06 16:06:19 -07:00
parent 0ab282400e
commit 320df7fe28
4 changed files with 48 additions and 49 deletions
@@ -1,6 +1,6 @@
-mininet (2.0.0d1) precise; urgency=low
+mininet (2.0.0d1-0ubuntu1) quantal; urgency=low

-  * Initial release
+  * Initial release.

 -- Bob Lantz <rlantz@cs.stanford.edu>  Sun, 01 Jul 2012 23:19:54 +0000

@@ -1,27 +1,29 @@
 Source: mininet
 Section: net
 Priority: extra
-Maintainer: Bob Lantz <rlantz@cs.stanford.edu>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Bob Lantz <rlantz@cs.stanford.edu>
 Standards-Version: 3.9.3
 Build-Depends:
-  debhelper (>= 7.0.50~),
-  python-dev,
-  python-pkg-resources,
-  python-setuptools,
-  help2man
+ debhelper (>= 7.0.50~),
+ help2man,
+ python-dev,
+ python-pkg-resources,
+ python-setuptools
+Homepage: http://openflow.org/mininet

 Package: mininet
 Architecture: any
 Depends:
-  openvswitch-switch,
-  openvswitch-controller,
-  telnet,
-  python-networkx,
-  ${misc:Depends},
-  ${python:Depends},
-  ${shlibs:Depends}
+ openvswitch-controller,
+ openvswitch-switch,
+ python-networkx,
+ telnet,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
 Description: Process-based network emulator
 Mininet is a network emulator which uses lightweight
 virtualization to create virtual networks for rapid
 prototyping of Software-Defined Network (SDN) designs
- using OpenFlow. http://openflow.org/mininet
+ using OpenFlow.
@@ -1,36 +1,33 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: mininet
-Source: https://github.com/mininet/mininet/tree/devel/ppa
+Source: https://github.com/mininet/mininet

 Files: *
-Copyright: 2009-2012 Bob Lantz
+Copyright: 2009-2012 Bob Lantz,
           2009-2012 Brandon Heller
-License: BSD-3-Clause
-    Mininet 2.0.0d1 License
-    .
-    Copyright (c) 2009-2012 Bob Lantz and Brandon Heller
-    .
-    We are making Mininet available for public use and benefit with the
-    expectation that others will use, modify and enhance the Software and
-    contribute those enhancements back to the community. However, since we
-    would like to make the Software available for broadest use, with as few
-    restrictions as possible permission is hereby granted, free of charge, to
-    any person obtaining a copy of this Software to deal in the Software
-    under the copyrights 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.
-    .
-    The name and trademarks of copyright holder(s) may NOT be used in
-    advertising or publicity pertaining to the Software or any derivatives
-    without specific, written prior permission.
+License: 
+  We are making Mininet available for public use and benefit with the
+  expectation that others will use, modify and enhance the Software and
+  contribute those enhancements back to the community. However, since we
+  would like to make the Software available for broadest use, with as few
+  restrictions as possible permission is hereby granted, free of charge, to
+  any person obtaining a copy of this Software to deal in the Software
+  under the copyrights 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.
+  .
+  The name and trademarks of copyright holder(s) may NOT be used in
+  advertising or publicity pertaining to the Software or any derivatives
+  without specific, written prior permission.
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)