* New upstream release.

* Added python(3)-wheel build dependency.
* Fixed VCS url (https).
* Removed disable-a-test-in-test_existing_file.patch
* Removed add-django-1.7-compat-with-new-django.setup.patch
* Rebased and fixed debian/patches/removed-privacy-breach.patch
* d/copyright fixed.

7 files changed, 41 insertions, 48 deletions

diff --git a/debian/changelog b/debian/changelog
index 0fc0258..ce26a65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+factory-boy (2.6.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Added python(3)-wheel build dependency.
+  * Fixed VCS url (https).
+  * Removed disable-a-test-in-test_existing_file.patch
+  * Removed add-django-1.7-compat-with-new-django.setup.patch
+  * Rebased and fixed debian/patches/removed-privacy-breach.patch
+  * d/copyright fixed.
+
+ -- Ondřej Nový <novy@ondrej.org>  Sun, 14 Feb 2016 19:26:48 +0100
+
 factory-boy (2.4.1-4) unstable; urgency=medium
 
   * Added Suggests: python-factory-boy-doc (Closes: #787282).
diff --git a/debian/control b/debian/control
index 2086d84..58f92cd 100644
--- a/debian/control
+++ b/debian/control
@@ -14,11 +14,13 @@ Build-Depends: debhelper (>= 9),
 Build-Depends-Indep: python-django,
                      python-mock,
                      python-unittest2,
+                     python-wheel,
                      python3-django,
-                     python3-mock
+                     python3-mock,
+                     python3-wheel,
 Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/factory-boy.git;a=summary
-Vcs-Git: git://anonscm.debian.org/openstack/factory-boy.git
+Vcs-Browser: https://anonscm.debian.org/cgit/openstack/factory-boy.git/
+Vcs-Git: https://anonscm.debian.org/git/openstack/factory-boy.git
 Homepage: https://github.com/rbarrois/factory_boy
 
 Package: python-factory-boy
diff --git a/debian/copyright b/debian/copyright
index 39d6cd3..d9208e1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,16 +2,16 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: factory_boy
 Source: https://github.com/rbarrois/factory_boy
 
-Files: debian/*
-Copyright: (c) 2012, Thomas Goirand <zigo@debian.org>
-           (c) 2012, Ghe Rivero <ghe.rivero@stackops.com>
-License: MIT
-
 Files: *
 Copyright: (c) 2010, Mark Sandstrom <mark@deliciouslynerdy.com>
            (c) 2011-2014, Raphaël Barrois <raphael.barrois+fboy@polytechnique.org>
 License: MIT
 
+Files: debian/*
+Copyright: (c) 2012, Thomas Goirand <zigo@debian.org>
+           (c) 2012, Ghe Rivero <ghe.rivero@stackops.com>
+License: MIT
+
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
diff --git a/debian/patches/add-django-1.7-compat-with-new-django.setup.patch b/debian/patches/add-django-1.7-compat-with-new-django.setup.patch
deleted file mode 100644
index f2cf540..0000000
--- a/debian/patches/add-django-1.7-compat-with-new-django.setup.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Make unit tests work with Django 1.7
-Author: Thomas Goirand <zigo@debian.org>
-Bug-Debian: https://bugs.debian.org/764837
-Forwarded: no
-Last-Update: 2014-10-12
-
---- factory-boy-2.4.1.orig/tests/test_django.py
-+++ factory-boy-2.4.1/tests/test_django.py
-@@ -50,6 +50,9 @@ from . import tools
- if django is not None:
-     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tests.djapp.settings')
- 
-+    if hasattr(django, 'setup'):
-+        django.setup()
-+
-     from django import test as django_test
-     from django.conf import settings
-     from django.db import models as django_models
diff --git a/debian/patches/disable-a-test-in-test_existing_file.patch b/debian/patches/disable-a-test-in-test_existing_file.patch
deleted file mode 100644
index 3ba987f..0000000
--- a/debian/patches/disable-a-test-in-test_existing_file.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Disable now broken test
-Author: Thomas Goirand <zigo@debian.org>
-Bug-Debian: https://bugs.debian.org/759914
-Forwarded: no
-Last-Update: 2014-08-31
-
---- factory-boy-2.4.1.orig/tests/test_django.py
-+++ factory-boy-2.4.1/tests/test_django.py
-@@ -430,7 +430,7 @@ class DjangoFileFieldTestCase(unittest.T
-         o2 = WithFileFactory.build(afile=o1.afile)
-         self.assertIsNone(o2.pk)
-         self.assertEqual(b'example_data\n', o2.afile.read())
--        self.assertEqual('django/example_1.data', o2.afile.name)
-+#        self.assertEqual('django/example_1.data', o2.afile.name)
- 
-     def test_no_file(self):
-         o = WithFileFactory.build(afile=None)
diff --git a/debian/patches/removed-privacy-breach.patch b/debian/patches/removed-privacy-breach.patch
index 8451b1c..db8bd3c 100644
--- a/debian/patches/removed-privacy-breach.patch
+++ b/debian/patches/removed-privacy-breach.patch
@@ -3,15 +3,31 @@ Author: Thomas Goirand <zigo@debian.org>
 Forwarded: not-needed
 Last-Update: 2014-07-03
 
---- factory-boy-2.4.1.orig/README.rst
-+++ factory-boy-2.4.1/README.rst
-@@ -1,9 +1,6 @@
+--- a/README.rst
++++ b/README.rst
+@@ -1,25 +1,6 @@
  factory_boy
  ===========
  
 -.. image:: https://secure.travis-ci.org/rbarrois/factory_boy.png?branch=master
 -    :target: http://travis-ci.org/rbarrois/factory_boy/
 -
+-.. image:: https://img.shields.io/pypi/v/factory_boy.svg
+-    :target: http://factoryboy.readthedocs.org/en/latest/changelog.html
+-    :alt: Latest Version
+-
+-.. image:: https://img.shields.io/pypi/pyversions/factory_boy.svg
+-    :target: https://pypi.python.org/pypi/factory_boy/
+-    :alt: Supported Python versions
+-
+-.. image:: https://img.shields.io/pypi/wheel/factory_boy.svg
+-    :target: https://pypi.python.org/pypi/factory_boy/
+-    :alt: Wheel status
+-
+-.. image:: https://img.shields.io/pypi/l/factory_boy.svg
+-    :target: https://pypi.python.org/pypi/factory_boy/
+-    :alt: License
+-
  factory_boy is a fixtures replacement based on thoughtbot's `factory_girl <http://github.com/thoughtbot/factory_girl>`_.
  
  As a fixtures replacement tool, it aims to replace static, hard to maintain fixtures
diff --git a/debian/patches/series b/debian/patches/series
index b296b96..e80f60f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 disable-intersphinx.patch
 removed-privacy-breach.patch
-disable-a-test-in-test_existing_file.patch
-add-django-1.7-compat-with-new-django.setup.patch