[Python-modules-commits] [voluptuous] 04/04: d/rules: Simplify and make consistent with team guidelines.

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository voluptuous.

commit d52a0d3235d2e946b8cf2ee119116a693fd9dee3
Author: Barry Warsaw <barry at ubuntu.com>
Date:   Tue Aug 2 13:42:41 2016 -0400

    d/rules: Simplify and make consistent with team guidelines.
    
    * d/rules: Simplify and make consistent with team guidelines.
    * d/control:
      - Bump Standards-Version to 3.9.8 with no other changes needed.
      - Add myself to Uploaders.
      - wrap-and-sort
---
 debian/changelog |  5 +++++
 debian/control   | 22 +++++++++++++---------
 debian/gbp.conf  | 12 ------------
 debian/rules     |  5 -----
 4 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef8efa2..aea86ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ voluptuous (0.9.2-1) UNRELEASED; urgency=medium
 
   [ Barry Warsaw ]
   * d/watch: Update to use pypi.debian.net redirector.
+  * d/rules: Simplify and make consistent with team guidelines.
+  * d/control:
+    - Bump Standards-Version to 3.9.8 with no other changes needed.
+    - Add myself to Uploaders.
+    - wrap-and-sort
 
  -- Barry Warsaw <barry at debian.org>  Tue, 02 Aug 2016 10:26:17 -0400
 
diff --git a/debian/control b/debian/control
index 032ebfe..d763c36 100644
--- a/debian/control
+++ b/debian/control
@@ -3,21 +3,25 @@ Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Antoine Musso <hashar at free.fr>,
- Paul Belanger <paul.belanger at polybeacon.com>,
- Robert S. Edmonds <edmonds at debian.org>
+           Paul Belanger <paul.belanger at polybeacon.com>,
+           Robert S. Edmonds <edmonds at debian.org>,
+           Barry Warsaw <barry at debian.org>
 Build-Depends: debhelper (>= 9),
- dh-python,
- python-all (>= 2.6.6-3), python3-all,
- python-nose, python3-nose,
- python-setuptools, python3-setuptools
-Standards-Version: 3.9.4
+               dh-python,
+               python-all (>= 2.6.6-3),
+               python-nose,
+               python-setuptools,
+               python3-all,
+               python3-nose,
+               python3-setuptools
+Standards-Version: 3.9.8
 Homepage: https://github.com/alecthomas/voluptuous
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/voluptuous.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/voluptuous.git
 
 Package: python-voluptuous
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
 Description: Python library to validate data
  Voluptuous is primarily intended to validate data coming in to Python
  as JSON, YAML, etc. The aim is to offer a light-weight style with three
@@ -31,7 +35,7 @@ Description: Python library to validate data
 
 Package: python3-voluptuous
 Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}
 Description: Python 3 library to validate data
  Voluptuous is primarily intended to validate data coming in to Python
  as JSON, YAML, etc. The aim is to offer a light-weight style with three
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 6ecff61..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[DEFAULT]
-cleaner = /bin/true
-upstream-tag = v%(version)s
-
-[git-buildpackage]
-upstream-tree=tag
-debian-branch=master
-overlay = True
-no-create-orig = True
-tarball-dir = ../tarballs/
-export-dir = ../build-area/
-compression = gzip
diff --git a/debian/rules b/debian/rules
index 5e8a9c2..c67bc7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,11 +7,6 @@ export PYBUILD_NAME=voluptuous
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
 
-get-orig-source:
-	uscan --download-current-version --rename --destdir ../tarballs
-
 override_dh_auto_test:
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_TEST_ARGS="nosetests --verbose --with-doctest {build_dir}/ README.md tests.md" dh_auto_test
-
-.PHONY: get-orig-source override_dh_auto_test

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/voluptuous.git