diff -Nru pysvn-1.7.8/debian/changelog pysvn-1.7.8/debian/changelog --- pysvn-1.7.8/debian/changelog 2014-02-11 12:08:36.000000000 +0000 +++ pysvn-1.7.8/debian/changelog 2014-04-29 00:59:55.000000000 +0000 @@ -1,3 +1,17 @@ +pysvn (1.7.8-1) unstable; urgency=low + + * New Maintainer (Closes: #741094) + * Buildsystem changed to pybuild + * debian/source/options adds extend-diff-ignore to ignore changes + made during compilation to upstream code. + * debian/rules override_dh_installdocs added (Closes: #736300). + * debian/copyright fixed issues with dep-5. + * debian/control: + - added new description to the dbg package. + - set Standards-Version: 3.9.5 no changes required. + + -- Josue Ortega Mon, 14 Apr 2014 12:18:08 -0600 + pysvn (1.7.8-0.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru pysvn-1.7.8/debian/control pysvn-1.7.8/debian/control --- pysvn-1.7.8/debian/control 2013-09-28 15:24:52.000000000 +0000 +++ pysvn-1.7.8/debian/control 2014-04-29 01:07:57.000000000 +0000 @@ -1,22 +1,31 @@ Source: pysvn Section: python Priority: optional -Maintainer: Henry Velez -Build-Depends: debhelper (>= 9), python-all-dev (>= 2.6.6-3~), python-all-dbg, - python-cxx-dev (>= 6.1.1-2), libsvn-dev (>= 0.12), libapr1-dev, libneon27-gnutls-dev, - subversion (>= 1.6.1), libaprutil1-dev, python-setuptools -XS-Python-Version: all -Standards-Version: 3.9.4 +Maintainer: Debian Python Modules Team +Uploaders: Josue Ortega +Build-Depends: + debhelper (>= 9), + dh-python, + libapr1-dev, + libaprutil1-dev, + libneon27-gnutls-dev, + libsvn-dev (>= 0.12), + python-all-dbg, + python-all-dev (>= 2.6.6-3~), + python-cxx-dev (>= 6.1.1-2), + python-setuptools, + subversion (>= 1.6.1) +X-Python-Version: all +Standards-Version: 3.9.5 Homepage: http://pysvn.tigris.org/ +Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pysvn/trunk/ +Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pysvn/trunk/ Package: python-svn Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} -Conflicts: python2.3-svn, python2.4-svn -Replaces: python2.3-svn, python2.4-svn -Provides: ${python:Provides}, python-pysvn +Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} +Provides: python-pysvn Suggests: python-svn-dbg -XB-Python-Version: ${python:Versions} Description: A(nother) Python interface to Subversion The pysvn module is a Python interface to the Subversion version control system. This API exposes client interfaces for managing a @@ -26,9 +35,15 @@ Priority: extra Section: debug Architecture: any -Depends: python-svn (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends} +Depends: + python-dbg, + python-svn (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} Provides: python-pysvn Description: A(nother) Python interface to Subversion (debug extension) The pysvn module is a Python interface to the Subversion version control system. This API exposes client interfaces for managing a working copy, querying a repository, and synchronizing the two. + . + This package contains the debugging symbols for python-svn. diff -Nru pysvn-1.7.8/debian/copyright pysvn-1.7.8/debian/copyright --- pysvn-1.7.8/debian/copyright 2011-08-14 06:06:52.000000000 +0000 +++ pysvn-1.7.8/debian/copyright 2014-04-29 01:06:10.000000000 +0000 @@ -1,61 +1,54 @@ -Format: http://dep.debian.net/deps/dep5/ -This package was debianized by Matthias Klose -on Fri, 3 Dec 2004 19:33:57 +0100. -Upstream-Name: pysvn -Maintainer: Henry Velez +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Barry A. Scott +Upstream-Contact: barryscott@tigris.org Source: http://pysvn.tigris.org/project_downloads.html -Upstream Author: Barry A. Scott Files: * -License: +Copyright: 2003-2012 Barry A. Scott +License: Apache-1.1 -================================================================= -Copyright (C) 2003-2004 Barry A. Scott. All rights reserved. - -================================================================= -The Apache Software License, Version 1.1 - -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 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 materials provided with the - distribution. - -3. The end-user documentation included with the redistribution, - if any, must include the following acknowledgment: - "This product includes software developed by - Barry A. Scott http://www.barrys-emacs.org." - Alternately, this acknowledgment may appear in the software itself, - if and wherever such third-party acknowledgments normally appear. - -4. The names "PySVN" must not be used to endorse or promote - products derived from this software without prior written - permission. For written permission, please contact - barry@barrys-emacs.org. - -5. Products derived from this software may not be called "PySVN", - nor may "PySVN" appear in their name, without prior written - permission of Barry Scott. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 THE APACHE SOFTWARE FOUNDATION OR -ITS 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. -================================================================= +License: Apache-1.1 + 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 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 materials provided with the + distribution. + . + 3. The end-user documentation included with the redistribution, + if any, must include the following acknowledgment: + "This product includes software developed by + Barry A. Scott http://www.barrys-emacs.org." + Alternately, this acknowledgment may appear in the software itself, + if and wherever such third-party acknowledgments normally appear. + . + 4. The names "PySVN" must not be used to endorse or promote + products derived from this software without prior written + permission. For written permission, please contact + barry@barrys-emacs.org. + . + 5. Products derived from this software may not be called "PySVN", + nor may "PySVN" appear in their name, without prior written + permission of Barry Scott. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 THE APACHE SOFTWARE FOUNDATION OR + ITS 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. + ================================================================= Files: Import/pycxx-6.2.2/* Copyright: Barry Scott, Paul F. Dubois @@ -65,7 +58,8 @@ Copyright: 2004-2011, Matthias Klose 2011, Julian Taylor License: BSD -Comment: This package was originaly debianized by Matthias Klose on Fri, 3 Dec 2004 17:16:12 +0100. +Comment: This package was originaly debianized by Matthias Klose + on Fri, 3 Dec 2004 17:16:12 +0100. License: BSD Copyright (c) 1998 - 2007 @@ -102,7 +96,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. . Additional BSD Notice - + . 1. This notice is required to be provided under our contract with the U.S. Department of Energy (DOE). This work was produced at the University of California, Lawrence Livermore National Laboratory under Contract No. diff -Nru pysvn-1.7.8/debian/python-svn.install pysvn-1.7.8/debian/python-svn.install --- pysvn-1.7.8/debian/python-svn.install 2013-09-29 13:28:25.000000000 +0000 +++ pysvn-1.7.8/debian/python-svn.install 2014-04-29 01:06:10.000000000 +0000 @@ -1,2 +1,2 @@ -Source/pysvn/_pysvn_2_7.so usr/lib/python2.7/dist-packages/pysvn/ Source/pysvn/__init__.py usr/lib/python2.7/dist-packages/pysvn/ +Source/pysvn/_pysvn_2_7.so usr/lib/python2.7/dist-packages/pysvn/ diff -Nru pysvn-1.7.8/debian/rules pysvn-1.7.8/debian/rules --- pysvn-1.7.8/debian/rules 2014-02-11 12:06:38.000000000 +0000 +++ pysvn-1.7.8/debian/rules 2014-04-29 00:59:55.000000000 +0000 @@ -1,8 +1,10 @@ #!/usr/bin/make -f # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +# export DH_VERBOSE=1 +export PYBUILD_NAME=pysvn + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie -export DEB_BUILD_MAINT_OPTIONS := hardening=+all,-pie DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -19,7 +21,7 @@ --platform=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS) %: - dh $@ --with=python2 + dh $@ --with=python2 --buildsystem=pybuild override_dh_auto_configure: cd $(CURDIR)/Source; python setup.py configure $(CONFIG_OPTS) @@ -29,3 +31,6 @@ override_dh_strip: dh_strip --dbg-package=python-svn-dbg + +override_dh_installdocs: + dh_installdocs --link-doc=python-svn \ No newline at end of file diff -Nru pysvn-1.7.8/debian/source/options pysvn-1.7.8/debian/source/options --- pysvn-1.7.8/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ pysvn-1.7.8/debian/source/options 2014-04-29 00:59:55.000000000 +0000 @@ -0,0 +1 @@ +extend-diff-ignore = "__init__.py" \ No newline at end of file