[trydiffoscope] 01/01: Revert "Move to pbr for packaging." - was an experiment adnd didn't mean to commit to master.

Chris Lamb chris at chris-lamb.co.uk
Tue Jan 31 05:23:30 UTC 2017


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

lamby pushed a commit to branch master
in repository trydiffoscope.

commit 6981e90005137a2ef1de79a8f3f670854b4ee0c0
Author: Chris Lamb <lamby at debian.org>
Date:   Tue Jan 31 18:23:14 2017 +1300

    Revert "Move to pbr for packaging." - was an experiment adnd didn't mean to commit to master.
    
    This reverts commit edef3c762526eaccc991b5a00f4ec8eb9a6da575.
---
 debian/changelog |  6 ------
 debian/control   |  2 --
 setup.cfg        | 13 -------------
 setup.py         | 12 ++++++++++--
 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b017037..9c37b4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-trydiffoscope (65) UNRELEASED; urgency=medium
-
-  * Move to pbr for packaging.
-
- -- Chris Lamb <lamby at debian.org>  Mon, 02 Jan 2017 17:09:05 +0000
-
 trydiffoscope (64) unstable; urgency=medium
 
   * New release after splitting from src:diffoscope.
diff --git a/debian/control b/debian/control
index ad46045..c38adc9 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,6 @@ Build-Depends:
  debhelper (>= 10),
  python-docutils,
  python3-all,
- python3-pbr,
- python3-setuptools,
 Standards-Version: 3.9.8
 Homepage: https://try.diffoscope.org/
 Vcs-Git: https://anonscm.debian.org/git/reproducible/trydiffoscope.git
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index bbb9a46..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-[metadata]
-name = trydiffoscope
-author = Chris Lamb
-version = 65
-author-email = lamby at debian.org
-summary = try.diffoscope.org command line client
-license = GPL-3+
-home-page = https://reproducible-builds.org/tools/
-requires-python = >=3.4
-
-[files]
-scripts =
-    trydiffoscope
diff --git a/setup.py b/setup.py
index 07f55fe..274ab43 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,11 @@
-import setuptools
+from distutils.core import setup
 
-setuptools.setup(setup_requires=['pbr'], pbr=True)
+setup(
+    name='trydiffoscope',
+    version='64',
+    author="Chris Lamb",
+    author_email="lamby at debian.org",
+    scripts=(
+        'trydiffoscope',
+    ),
+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/trydiffoscope.git



More information about the Reproducible-commits mailing list