[pybtex] 54/108: minor changes in debian/changelog control copyright

[Daniel Stender]

This is an automated email from the git hooks/post-receive script.

stender pushed a commit to branch master
in repository pybtex.

commit 6cab47295f86f20600f92b3873f35065fa29389d
Author: Daniel Stender <stender at debian.org>
Date:   Tue Apr 26 06:58:08 2011 +0000

    minor changes in debian/changelog control copyright
---
 debian/changelog | 10 +++++-----
 debian/control   | 30 +++++++++++++++++++++---------
 debian/copyright |  5 +----
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f57aefc..2f8ed62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,19 @@
-pybtex (0.15-1) unstable; urgency=low
+pybtex (0.15-1) UNRELEASED; urgency=low
 
   * New maintainer (closes: #587423).
   * New upstream release
-    + Changed license in debian/copyright from GPL-3 to EXPAT. 
+    + Upstream relicenced everything to Expat.
    * Changed debian/copyright
     + to meet CANDIDATE DEP-5.
     + removed GPL-2+ license for database/convert/__main__.py.
   * Uploaded to Unstable.
-  
- -- Daniel Stender <daniel at danielstender.com>  Tue, 15 Mar 2011 16:51:05 +0100
+
+ -- Daniel Stender <daniel at danielstender.com>  Tue, 26 Apr 2011 08:49:30 +0200
 
 pybtex (0.14-1) experimental; urgency=low
 
   * New upstream release.
-    + Bump minimum Python version to 2.6. 
+    + Bump minimum Python version to 2.6.
     + Drop patch to import bzrlib only when needed; applied upstream.
     + Improve performance on very long name lists (closes: #595082).
 
diff --git a/debian/control b/debian/control
index 579507b..59e94a7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,21 +2,33 @@ Source: pybtex
 Section: tex
 Priority: optional
 Maintainer: Daniel Stender <daniel at danielstender.com>
-Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.5), python-support (>= 0.90),
-  python-setuptools, python-nose, python-pyparsing, python-yaml,
-  python-docutils, python-jinja2, python-pygments, elinks-lite | elinks
-XS-Python-Version: >= 2.6
-Standards-Version: 3.9.1
+Uploaders:
+ Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Build-Depends:
+ debhelper (>= 7.0.50~),
+ elinks-lite | elinks,
+ python (>= 2.6.5-13~),
+ python-docutils,
+ python-jinja2,
+ python-nose,
+ python-pygments,
+ python-pyparsing,
+ python-setuptools,
+ python-support (>= 0.90),
+ python-yaml
+X-Python-Version: >= 2.6
+Standards-Version: 3.9.2
 Homepage: http://pybtex.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/pybtex/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/pybtex/trunk/
 
 Package: pybtex
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-pyparsing
-Conflicts: pybliographer (<< 1.2.12-3.1~), texlive-binaries (<< 2009-5~),
-  texlive-base-bin (<< 2009-5~)
+Depends: python-pyparsing, ${misc:Depends}, ${python:Depends}
+Conflicts:
+ pybliographer (<< 1.2.12-3.1~),
+ texlive-base-bin (<< 2009-5~),
+ texlive-binaries (<< 2009-5~)
 Recommends: python-yaml
 Description: BibTeX-compatible bibliography processor
  Pybtex reads citation information from a file and produces a formatted
diff --git a/debian/copyright b/debian/copyright
index 17b8f1e..46eba9d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
 Upstream-Name: pybtex
 Upstream-Contact: Andrey Golovizin <golovizin at gmail.com>
 Source: http://pybtex.sourceforge.net/
@@ -7,13 +7,11 @@ Files: *
 Copyright: 2006-2011, Andrey Golovizin
 License: Expat
 
-
 Files: debian/*
 Copyright: 2009-2010, Jakub Wilk <jwilk at debian.org>
            2011, Daniel Stender <daniel at danielstender.com>
 License: Expat
 
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
@@ -33,4 +31,3 @@ License: Expat
  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.
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pybtex.git