I updated the package to use upstream version 0.10.5, pybuild and build
a python3 version. (0.10.2 had an error)

Attached are the changes I made (minus the patch importing the new
version from upstream).

I can push the changes to alioth and make a new release, but I don't
like changing packages I'm not normally responsible for with out some
acknowledgement.

Diane
From 9edf66eaa3d609aaae5f8d6d44c0958ba58c63b8 Mon Sep 17 00:00:00 2001
From: Diane Trout <di...@ghic.org>
Date: Thu, 23 Feb 2017 14:09:45 -0800
Subject: [PATCH 2/6] New upstream version 0.10.5

---
 debian/changelog | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fa5cd33..c579640 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-rope (0.10.2-2) UNRELEASED; urgency=low
+rope (0.10.5-1) UNRELEASED; urgency=low
 
   [ Arnaud Fontaine ]
   * d/source/options: Ignore .egg-info directory.
@@ -6,6 +6,9 @@ rope (0.10.2-2) UNRELEASED; urgency=low
   [ Ondřej Nový ]
   * Fixed VCS URL (https)
 
+  [ Diane Trout ]
+  * New upstream version 0.10.5
+
  -- Arnaud Fontaine <ar...@debian.org>  Fri, 18 Jul 2014 10:45:28 +0900
 
 rope (0.10.2-1) unstable; urgency=low
-- 
2.11.0

From 9940a80fc9c91307526f488a78c91e39a9a3ea12 Mon Sep 17 00:00:00 2001
From: Diane Trout <di...@ghic.org>
Date: Thu, 23 Feb 2017 14:14:48 -0800
Subject: [PATCH 3/6] Build a python3 version using pybuild

Update to debhelper 10
Add dh-python to build-depends
Add Python 3 & setuptools to build-depends
---
 debian/changelog |  5 +++++
 debian/compat    |  2 +-
 debian/control   | 29 ++++++++++++++++++++++++-----
 debian/copyright |  1 +
 debian/rules     |  7 ++++---
 5 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c579640..a6f0dca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,11 @@ rope (0.10.5-1) UNRELEASED; urgency=low
 
   [ Diane Trout ]
   * New upstream version 0.10.5
+  * Build a python3 version using pybuild
+    + Update to debhelper 10
+    + Add dh-python to build-depends
+    + Add Python 3 & setuptools to build-depends
+    + Remove cdbs
 
  -- Arnaud Fontaine <ar...@debian.org>  Fri, 18 Jul 2014 10:45:28 +0900
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+10
diff --git a/debian/control b/debian/control
index 4fe596c..af7fc52 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,14 @@ Section: devel
 Priority: optional
 Maintainer: Arnaud Fontaine <ar...@debian.org>
 Uploaders: Debian Python Modules Team <python-modules-t...@lists.alioth.debian.org>
-Build-Depends: cdbs (>= 0.4.90~),
-               debhelper (>= 7.0.0),
-               python (>= 2.6.6-3~)
-X-Python-Version: >= 2.5
+Build-Depends: debhelper (>= 10),
+               dh-python,
+               python-all (>= 2.6.6-3~),
+               python-setuptools,
+               python3-all,
+               python3-setuptools
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
 Standards-Version: 3.9.5
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/rope.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/rope.git
@@ -19,7 +23,7 @@ Depends: ${python:Depends},
 Recommends: python-svn,
             mercurial,
             git-core
-Description: Python refactoring library
+Description: Python 2 refactoring library
  Rope is a Python refactoring library that can be used with several editors
  and IDEs. It provides many refactoring operations as well as forms of code 
  assistance like auto-completion and access to documentation. To make use of 
@@ -28,3 +32,18 @@ Description: Python refactoring library
  . 
  In Debian, this package is used by the Python-ropemacs package, an Emacs mode 
  that adds Python refactoring and IDE features to the Emacs editor.
+ .
+ This provides the Python 2 version of the library.
+
+Package: python3-rope
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}
+Recommends: git-core, mercurial, python3-svn
+Description: Python 3 refactoring library
+ Rope is a Python refactoring library that can be used with several editors
+ and IDEs. It provides many refactoring operations as well as forms of code
+ assistance like auto-completion and access to documentation. To make use of
+ refactoring in Mercurial, Git and Svn repositories, the recommended packages
+ must be installed. For a complete list of features, see the project homepage.
+ .
+ This provides the Python3 version of the library.
diff --git a/debian/copyright b/debian/copyright
index 9c2ac77..7fa96ea 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,6 +10,7 @@ License: GPL-2+
 Files: debian/*
 Copyright: 2008-2014 David Spreen <netzw...@debian.org>
            2014 Arnaud Fontaine <ar...@debian.org>
+           2016 Diane Trout <di...@debian.org>
 License: GPL-2+
 
 License: GPL-2+
diff --git a/debian/rules b/debian/rules
index 8acb0ff..bfc4a64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
+export PYBUILD_NAME=rope
+export LC_ALL=C.UTF-8
 
-DEB_INSTALL_CHANGELOGS_ALL := docs/done.rst
+%:
+	dh $@ --with python2,python3 --buildsystem=pybuild
-- 
2.11.0

From 286598d393caaf21edc35799efdde66ec35fbd4f Mon Sep 17 00:00:00 2001
From: Diane Trout <di...@ghic.org>
Date: Thu, 23 Feb 2017 14:49:58 -0800
Subject: [PATCH 4/6] wrap-and-sort modified the Package block

---
 debian/control | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index af7fc52..57f655b 100644
--- a/debian/control
+++ b/debian/control
@@ -18,19 +18,16 @@ Homepage: http://rope.sourceforge.net/
 
 Package: python-rope
 Architecture: all
-Depends: ${python:Depends},
-         ${misc:Depends}
-Recommends: python-svn,
-            mercurial,
-            git-core
+Depends: ${misc:Depends}, ${python:Depends}
+Recommends: git-core, mercurial, python-svn
 Description: Python 2 refactoring library
  Rope is a Python refactoring library that can be used with several editors
- and IDEs. It provides many refactoring operations as well as forms of code 
- assistance like auto-completion and access to documentation. To make use of 
- refactoring in Mercurial, Git and Svn repositories, the recommended packages 
+ and IDEs. It provides many refactoring operations as well as forms of code
+ assistance like auto-completion and access to documentation. To make use of
+ refactoring in Mercurial, Git and Svn repositories, the recommended packages
  must be installed. For a complete list of features, see the project homepage.
- . 
- In Debian, this package is used by the Python-ropemacs package, an Emacs mode 
+ .
+ In Debian, this package is used by the Python-ropemacs package, an Emacs mode
  that adds Python refactoring and IDE features to the Emacs editor.
  .
  This provides the Python 2 version of the library.
-- 
2.11.0

From 6e6e253caafdc5deffacd7e3d7ecc64387d08a7a Mon Sep 17 00:00:00 2001
From: Diane Trout <di...@ghic.org>
Date: Thu, 23 Feb 2017 14:50:22 -0800
Subject: [PATCH 5/6] Update Standards-Version to 3.9.8.0. No changes needed.

---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a6f0dca..4780b01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ rope (0.10.5-1) UNRELEASED; urgency=low
     + Add dh-python to build-depends
     + Add Python 3 & setuptools to build-depends
     + Remove cdbs
+  * Update Standards-Version to 3.9.8.0. No changes needed.
 
  -- Arnaud Fontaine <ar...@debian.org>  Fri, 18 Jul 2014 10:45:28 +0900
 
diff --git a/debian/control b/debian/control
index 57f655b..d14d9a8 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 10),
                python3-setuptools
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
-Standards-Version: 3.9.5
+Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/rope.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/rope.git
 Homepage: http://rope.sourceforge.net/
-- 
2.11.0

From 43862e09a80c5a1771bfba13934d7d120c30fc23 Mon Sep 17 00:00:00 2001
From: Diane Trout <di...@ghic.org>
Date: Thu, 23 Feb 2017 14:55:46 -0800
Subject: [PATCH 6/6] Add basic autodep8 test

---
 debian/changelog     | 1 +
 debian/control       | 1 +
 debian/tests/control | 6 ++++++
 3 files changed, 8 insertions(+)
 create mode 100644 debian/tests/control

diff --git a/debian/changelog b/debian/changelog
index 4780b01..b3d0339 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ rope (0.10.5-1) UNRELEASED; urgency=low
     + Add Python 3 & setuptools to build-depends
     + Remove cdbs
   * Update Standards-Version to 3.9.8.0. No changes needed.
+  * Add basic autodep8 test
 
  -- Arnaud Fontaine <ar...@debian.org>  Fri, 18 Jul 2014 10:45:28 +0900
 
diff --git a/debian/control b/debian/control
index d14d9a8..6c7316b 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: debhelper (>= 10),
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
 Standards-Version: 3.9.8
+Testsuite: autopkgtest-pkg-python
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/rope.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/rope.git
 Homepage: http://rope.sourceforge.net/
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..378f34a
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,6 @@
+Test-Command: set -e ; for py in $(pyversions -r 2>/dev/null) ; do cd "$ADTTMP" ; echo "Testing with $py:" ; $py -c "import rope; print rope" ; done
+Depends: python-all, python-rope
+
+Test-Command: set -e ; for py in $(py3versions -r 2>/dev/null) ; do cd "$ADTTMP" ; echo "Testing with $py:" ; $py -c "import rope; print(rope)" ; done
+Depends: python3-all, python3-rope
+
-- 
2.11.0

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to