[Python-modules-commits] r6731 - in packages/enthought-traits/trunk/debian (7 files)

varun at users.alioth.debian.org varun at users.alioth.debian.org
Sun Oct 26 04:53:35 UTC 2008


    Date: Sunday, October 26, 2008 @ 04:53:33
  Author: varun
Revision: 6731

* New upstream release
* Rename the package to match upstream naming conventions	
* Update debian/watch and debian/orig-tar.sh files

Modified:
  packages/enthought-traits/trunk/debian/changelog
  packages/enthought-traits/trunk/debian/control
  packages/enthought-traits/trunk/debian/copyright
  packages/enthought-traits/trunk/debian/orig-tar.sh
  packages/enthought-traits/trunk/debian/rules
  packages/enthought-traits/trunk/debian/watch
Deleted:
  packages/enthought-traits/trunk/debian/README.Debian-source

Deleted: packages/enthought-traits/trunk/debian/README.Debian-source
===================================================================
--- packages/enthought-traits/trunk/debian/README.Debian-source	2008-10-24 22:51:07 UTC (rev 6730)
+++ packages/enthought-traits/trunk/debian/README.Debian-source	2008-10-26 04:53:33 UTC (rev 6731)
@@ -1,14 +0,0 @@
-enthought-traits
-================
-
-The orig.tar.gz used for packaging enthought-traits has been created
-by merging source tarballs of the following enthought projects:
-
-  enthought.etsconfig
-  enthought.traits  
-  
-Please use the rules/get-orig-source target to create the orig.tar.gz.
-For more details on repackaging of upstream sources please see the
-debian/orig-tar.sh file.
-
- -- Varun Hiremath <varun at debian.org>, Tue,  8 Jan 2008 00:34:33 +0530

Modified: packages/enthought-traits/trunk/debian/changelog
===================================================================
--- packages/enthought-traits/trunk/debian/changelog	2008-10-24 22:51:07 UTC (rev 6730)
+++ packages/enthought-traits/trunk/debian/changelog	2008-10-26 04:53:33 UTC (rev 6731)
@@ -1,3 +1,11 @@
+python-traits (3.0.2-1) experimental; urgency=low
+
+  * New upstream release
+  * Rename the package to match upstream naming conventions	
+  * Update debian/watch and debian/orig-tar.sh files
+
+ -- Varun Hiremath <varun at debian.org>  Sun, 26 Oct 2008 00:51:32 -0400
+
 enthought-traits (2.0.5-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/enthought-traits/trunk/debian/control
===================================================================
--- packages/enthought-traits/trunk/debian/control	2008-10-24 22:51:07 UTC (rev 6730)
+++ packages/enthought-traits/trunk/debian/control	2008-10-26 04:53:33 UTC (rev 6731)
@@ -1,19 +1,21 @@
-Source: enthought-traits
+Source: python-traits
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Ondrej Certik <ondrej at certik.cz>, Varun Hiremath <varun at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), python-all-dev, python-central (>= 0.6), python-setuptools
+Build-Depends: cdbs, debhelper (>= 6), python-all-dev, python-central (>= 0.6), python-setuptools
 Standards-Version: 3.8.0
-Homepage: http://code.enthought.com/traits/
+Homepage: http://pypi.python.org/pypi/Traits
 XS-Python-Version: >=2.4
-Vcs-Svn: svn://svn.debian.org/python-modules/packages/enthought-traits/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/enthought-traits/trunk/?op=log
+Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-traits/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/python-traits/trunk/?op=log
 
-Package: python-enthought-traits
+Package: python-traits
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-Suggests: python-enthought-traits-ui
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-enthoughtbase
+Conflicts: python-enthought-traits (<< 3.0.0)
+Replaces: python-enthought-traits (<< 3.0.0)
+Suggests: python-traitsgui
 XB-Python-Version: ${python:Versions}
 Description: Manifest typing and reactive programming for Python
  The traits package provides a metaclass with special attributes that
@@ -28,3 +30,10 @@
     callbacks
   * Visualization: With the TraitsUI package, GUIs can be generated
     automatically from traited objects.
+
+Package: python-enthought-traits
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, python-traits
+Description: Manifest typing and reactive programming for Python (Transition package)
+ This is a dummy package that eases the transition to new python-traits package.
+ It can be removed safely.

Modified: packages/enthought-traits/trunk/debian/copyright
===================================================================
--- packages/enthought-traits/trunk/debian/copyright	2008-10-24 22:51:07 UTC (rev 6730)
+++ packages/enthought-traits/trunk/debian/copyright	2008-10-26 04:53:33 UTC (rev 6731)
@@ -1,4 +1,5 @@
-This package was debianized by Ondrej Certik <ondrej at certik.cz>
+This package was debianized by Ondrej Certik <ondrej at certik.cz> and
+Varun Hiremath <varun at debian.org>
 
 It was downloaded from http://code.enthought.com/downloads/source
 
@@ -30,6 +31,243 @@
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+---------------------------------------------------------------------------
+
+Icon License:
+
+The icons are mostly derived work from other icons. As such they are
+licensed accordingly to the original license:
+
+    Eclipse: Eclipse Public Licence
+    Enthought: BSD 3-Clause 
+    Nuvola: LGPL
+
+Unless stated explicitly, icons are work of enthought, and are
+released under a 3 clause BSD license.
+
+On Debian systems, the complete text of the LGPL License can be 
+found in `/usr/share/common-licenses/LGPL'.
+
+On Debian systems, the complete text of the BSD License can be 
+found in `/usr/share/common-licenses/BSD'.
+
+Full text of Eclipse Public License follows:
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE 
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE 
+    PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+    
+    1. DEFINITIONS
+    
+    "Contribution" means:
+    
+    a) in the case of the initial Contributor, the initial code and documentation 
+    distributed under this Agreement, and
+    b) in the case of each subsequent Contributor:
+    
+    i) changes to the Program, and
+    
+    ii) additions to the Program;
+    
+    where such changes and/or additions to the Program originate from and are 
+    distributed by that particular Contributor. A Contribution 'originates' 
+    from a Contributor if it was added to the Program by such Contributor itself 
+    or anyone acting on such Contributor's behalf. Contributions do not include 
+    additions to the Program which: (i) are separate modules of software 
+    distributed in conjunction with the Program under their own license 
+    agreement, and (ii) are not derivative works of the Program.
+    
+    "Contributor" means any person or entity that distributes the Program.
+    
+    "Licensed Patents " mean patent claims licensable by a Contributor which are 
+    necessarily infringed by the use or sale of its Contribution alone or when 
+    combined with the Program.
+    
+    "Program" means the Contributions distributed in accordance with this 
+    Agreement.
+    
+    "Recipient" means anyone who receives the Program under this Agreement, 
+    including all Contributors.
+    
+    2. GRANT OF RIGHTS
+    
+    a) Subject to the terms of this Agreement, each Contributor hereby grants 
+    Recipient a non-exclusive, worldwide, royalty-free copyright license to 
+    reproduce, prepare derivative works of, publicly display, publicly perform, 
+    distribute and sublicense the Contribution of such Contributor, if any, 
+    and such derivative works, in source code and object code form.
+    
+    b) Subject to the terms of this Agreement, each Contributor hereby grants 
+    Recipient a non-exclusive, worldwide, royalty-free patent license under 
+    Licensed Patents to make, use, sell, offer to sell, import and otherwise 
+    transfer the Contribution of such Contributor, if any, in source code and 
+    object code form. This patent license shall apply to the combination of 
+    the Contribution and the Program if, at the time the Contribution is added 
+    by the Contributor, such addition of the Contribution causes such 
+    combination to be covered by the Licensed Patents. The patent license shall 
+    not apply to any other combinations which include the Contribution. No 
+    hardware per se is licensed hereunder.
+    
+    c) Recipient understands that although each Contributor grants the licenses 
+    to its Contributions set forth herein, no assurances are provided by any 
+    Contributor that the Program does not infringe the patent or other 
+    intellectual property rights of any other entity. Each Contributor disclaims 
+    any liability to Recipient for claims brought by any other entity based on 
+    infringement of intellectual property rights or otherwise. As a condition to 
+    exercising the rights and licenses granted hereunder, each Recipient hereby 
+    assumes sole responsibility to secure any other intellectual property rights 
+    needed, if any. For example, if a third party patent license is required to 
+    allow Recipient to distribute the Program, it is Recipient's responsibility 
+    to acquire that license before distributing the Program.
+    
+    d) Each Contributor represents that to its knowledge it has sufficient 
+    copyright rights in its Contribution, if any, to grant the copyright license 
+    set forth in this Agreement.
+    
+    3. REQUIREMENTS
+    
+    A Contributor may choose to distribute the Program in object code form under 
+    its own license agreement, provided that:
+    
+    a) it complies with the terms and conditions of this Agreement; and
+    
+    b) its license agreement:
+    
+    i) effectively disclaims on behalf of all Contributors all warranties and 
+    conditions, express and implied, including warranties or conditions of title 
+    and non-infringement, and implied warranties or conditions of merchantability 
+    and fitness for a particular purpose;
+    
+    ii) effectively excludes on behalf of all Contributors all liability for 
+    damages, including direct, indirect, special, incidental and consequential 
+    damages, such as lost profits;
+    
+    iii) states that any provisions which differ from this Agreement are offered 
+    by that Contributor alone and not by any other party; and
+    
+    iv) states that source code for the Program is available from such 
+    Contributor, and informs licensees how to obtain it in a reasonable manner on 
+    or through a medium customarily used for software exchange.
+    
+    When the Program is made available in source code form:
+    
+    a) it must be made available under this Agreement; and
+    
+    b) a copy of this Agreement must be included with each copy of the Program.
+    
+    Contributors may not remove or alter any copyright notices contained within 
+    the Program.
+    
+    Each Contributor must identify itself as the originator of its Contribution, 
+    if any, in a manner that reasonably allows subsequent Recipients to identify 
+    the originator of the Contribution.
+    
+    4. COMMERCIAL DISTRIBUTION
+    
+    Commercial distributors of software may accept certain responsibilities with 
+    respect to end users, business partners and the like. While this license is 
+    intended to facilitate the commercial use of the Program, the Contributor who 
+    includes the Program in a commercial product offering should do so in a manner 
+    which does not create potential liability for other Contributors. Therefore, 
+    if a Contributor includes the Program in a commercial product offering, such 
+    Contributor ("Commercial Contributor") hereby agrees to defend and indemnify 
+    every other Contributor ("Indemnified Contributor") against any losses, 
+    damages and costs (collectively "Losses") arising from claims, lawsuits and 
+    other legal actions brought by a third party against the Indemnified 
+    Contributor to the extent caused by the acts or omissions of such Commercial 
+    Contributor in connection with its distribution of the Program in a commercial 
+    product offering. The obligations in this section do not apply to any claims 
+    or Losses relating to any actual or alleged intellectual property 
+    infringement. In order to qualify, an Indemnified Contributor must: 
+    a) promptly notify the Commercial Contributor in writing of such claim, and 
+    b) allow the Commercial Contributor to control, and cooperate with the 
+    Commercial Contributor in, the defense and any related settlement 
+    negotiations. The Indemnified Contributor may participate in any such claim 
+    at its own expense.
+    
+    For example, a Contributor might include the Program in a commercial product 
+    offering, Product X. That Contributor is then a Commercial Contributor. If 
+    that Commercial Contributor then makes performance claims, or offers 
+    warranties related to Product X, those performance claims and warranties are 
+    such Commercial Contributor's responsibility alone. Under this section, the 
+    Commercial Contributor would have to defend claims against the other 
+    Contributors related to those performance claims and warranties, and if a 
+    court requires any other Contributor to pay any damages as a result, the 
+    Commercial Contributor must pay those damages.
+    
+    5. NO WARRANTY
+    
+    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON 
+    AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER 
+    EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR 
+    CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A 
+    PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the 
+    appropriateness of using and distributing the Program and assumes all 
+    risks associated with its exercise of rights under this Agreement , 
+    including but not limited to the risks and costs of program errors, 
+    compliance with applicable laws, damage to or loss of data, programs or 
+    equipment, and unavailability or interruption of operations.
+    
+    6. DISCLAIMER OF LIABILITY
+    
+    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY 
+    CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION 
+    LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE 
+    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE 
+    POSSIBILITY OF SUCH DAMAGES.
+    
+    7. GENERAL
+    
+    If any provision of this Agreement is invalid or unenforceable under 
+    applicable law, it shall not affect the validity or enforceability of the 
+    remainder of the terms of this Agreement, and without further action by 
+    the parties hereto, such provision shall be reformed to the minimum extent 
+    necessary to make such provision valid and enforceable.
+    
+    If Recipient institutes patent litigation against any entity (including a 
+    cross-claim or counterclaim in a lawsuit) alleging that the Program itself 
+    (excluding combinations of the Program with other software or hardware) 
+    infringes such Recipient's patent(s), then such Recipient's rights granted 
+    under Section 2(b) shall terminate as of the date such litigation is filed.
+    
+    All Recipient's rights under this Agreement shall terminate if it fails to 
+    comply with any of the material terms or conditions of this Agreement and 
+    does not cure such failure in a reasonable period of time after becoming 
+    aware of such noncompliance. If all Recipient's rights under this Agreement 
+    terminate, Recipient agrees to cease use and distribution of the Program as 
+    soon as reasonably practicable. However, Recipient's obligations under this 
+    Agreement and any licenses granted by Recipient relating to the Program 
+    shall continue and survive.
+    
+    Everyone is permitted to copy and distribute copies of this Agreement, but 
+    in order to avoid inconsistency the Agreement is copyrighted and may only 
+    be modified in the following manner. The Agreement Steward reserves the 
+    right to publish new versions (including revisions) of this Agreement from 
+    time to time. No one other than the Agreement Steward has the right to 
+    modify this Agreement. The Eclipse Foundation is the initial Agreement 
+    Steward. The Eclipse Foundation may assign the responsibility to serve as 
+    the Agreement Steward to a suitable separate entity. Each new version of 
+    the Agreement will be given a distinguishing version number. The Program 
+    (including Contributions) may always be distributed subject to the version 
+    of the Agreement under which it was received. In addition, after a new 
+    version of the Agreement is published, Contributor may elect to distribute 
+    the Program (including its Contributions) under the new version. Except as 
+    expressly stated in Sections 2(a) and 2(b) above, Recipient receives no 
+    rights or licenses to the intellectual property of any Contributor under 
+    this Agreement, whether expressly, by implication, estoppel or otherwise. 
+    All rights in the Program not expressly granted under this Agreement are 
+    reserved.
+    
+    This Agreement is governed by the laws of the State of New York and the 
+    intellectual property laws of the United States of America. No party to 
+    this Agreement will bring a legal action under this Agreement more than 
+    one year after the cause of action arose. Each party waives its rights to 
+    a jury trial in any resulting litigation.
+---------------------------------------------------------------------------
+
 The Debian packaging is (C) 2007, Ondrej Certik <ondrej at certik.cz>,
-Varun Hiremath <varunhiremath at gmail.com> and is licensed under the
+Varun Hiremath <varun at debian.org> and is licensed under the
 GPL, see `/usr/share/common-licenses/GPL'.

Modified: packages/enthought-traits/trunk/debian/orig-tar.sh
===================================================================
--- packages/enthought-traits/trunk/debian/orig-tar.sh	2008-10-24 22:51:07 UTC (rev 6730)
+++ packages/enthought-traits/trunk/debian/orig-tar.sh	2008-10-26 04:53:33 UTC (rev 6731)
@@ -1,36 +1,8 @@
 #!/bin/sh -e
 
-# $1 version
-TAR=../enthought-traits_$1.orig.tar.gz
-DIR=enthought-traits_$1.orig
-
-# package list (latest upstream version)
-PACKAGE_LIST="
-enthought.etsconfig-2.0.2.tar.gz
-enthought.traits-2.0.5.tar.gz
-"
-
-# download the tarballs
-REPO=http://code.enthought.com/enstaller/eggs/source/
-mkdir $DIR
-(cd $DIR; \
-for package in $PACKAGE_LIST
-do
-    wget $REPO/$package;
-    name=`echo $package | sed -e 's/-.*//'`;
-    dir=`echo $package | sed -e 's/\.tar.*//'`;
-    tar zxf $package;
-    mv $dir $name;
-    rm $package;
-done )
-
-# create the tarball
-GZIP=--best tar -c -z -f $TAR $DIR
-rm -rf $DIR
-
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then
   . .svn/deb-layout
-  mv $TAR $origDir
-  echo "moved $TAR to $origDir"
+  mv $3 $origDir
+  echo "moved $3 to $origDir"
 fi

Modified: packages/enthought-traits/trunk/debian/rules
===================================================================
--- packages/enthought-traits/trunk/debian/rules	2008-10-24 22:51:07 UTC (rev 6730)
+++ packages/enthought-traits/trunk/debian/rules	2008-10-26 04:53:33 UTC (rev 6731)
@@ -7,24 +7,12 @@
 
 DEB_COMPRESS_EXCLUDE		:= .py
 DEB_PYTHON_INSTALL_ARGS_ALL 	+= --single-version-externally-managed
+DEB_DESTDIR			 = $(CURDIR)/debian/python-traits
+PYSHARED			 = $(DEB_DESTDIR)`pycentral pycentraldir python-traits`
 
-clean::
-	find -type d | grep build$ | xargs $(RM) -r
+binary-predeb/python-traits::
+	find $(PYSHARED) -type f | xargs sed -i '/^#!/d'
+	find $(PYSHARED) -type f | xargs chmod 644
 
-python-build-stamp-%:
-	for file in $(CURDIR)/*/setup.py; do \
-	  DIR=`dirname $$file`; \
-	  cd $$DIR && python$* setup.py build; \
-	done
-
-python-install-%:
-	for file in $(CURDIR)/*/setup.py; do \
-	  DIR=`dirname $$file`; \
-	  cd $$DIR && python$* setup.py install --root $(DEB_DESTDIR); \
-	done
-	touch $(DEB_DESTDIR)/usr/lib/python$*/site-packages/enthought/__init__.py
-	touch $(DEB_DESTDIR)/usr/lib/python$*/site-packages/enthought/traits/__init__.py
-	touch $(DEB_DESTDIR)/usr/lib/python$*/site-packages/enthought/traits/ui/__init__.py
-
 get-orig-source:
-	sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
+	-uscan --upstream-version 0 --rename

Modified: packages/enthought-traits/trunk/debian/watch
===================================================================
--- packages/enthought-traits/trunk/debian/watch	2008-10-24 22:51:07 UTC (rev 6730)
+++ packages/enthought-traits/trunk/debian/watch	2008-10-26 04:53:33 UTC (rev 6731)
@@ -1,2 +1,4 @@
 version=3
-http://code.enthought.com/enstaller/eggs/source/enthought.traits-([\d\.a-z]+)\.tar\.gz
+opts="uversionmangle=s/([ab])/~$1/,dversionmangle=s/\+.*//" \
+http://pypi.python.org/packages/source/T/Traits/Traits-(.*).tar.gz \
+debian debian/orig-tar.sh




More information about the Python-modules-commits mailing list