Control: tag -1 + patch

Hi,

I've pushed my proposed changes to the bug780610 branch in the
packaging Git repository, and am attaching the corresponding diff.
Should I go ahead with a NMU, or do the maintainers prefer to handle
it themselves?

Cheers!
--
intrigeri

diff --git a/debian/changelog b/debian/changelog
index a3397e1..70ba6cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+python-potr (1.0.1-1.1~1.gbpcbf370) UNRELEASED; urgency=medium
+
+  ** SNAPSHOT build @cbf3705b8cf44dccb5f05b581716405363648099 **
+
+  * Non-maintainer upload.
+  * Install the convertkey script in python-potr (Closes: #780610).
+  * debian/control: don't pretend that python3-potr ships the convertkey script.
+
+ -- intrigeri <intrig...@debian.org>  Sat, 16 May 2015 12:26:21 +0200
+
 python-potr (1.0.1-1) unstable; urgency=low
 
   * new upstream version, 1.0.1
diff --git a/debian/control b/debian/control
index 479b9e6..64bd82e 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,4 @@ Description: Pure Python implementation of the OTR protocol (Python 3)
  gajim-otr plugin will be available in the next major Gajim release to
  provide IM encryption independently of the underlying chat protocol.
  .
- This package also includes the command line utility 'convertkey' for
- converting the old OTR file format to the new one.
- .
  This is the Python 3 version of the package.
diff --git a/debian/python-potr.dirs b/debian/python-potr.dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/python-potr.dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/rules b/debian/rules
index d8d54b4..89fbece 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ install-python%:
 
 override_dh_auto_install: $(PYTHON3:%=install-python%)
 	dh_auto_install
+	install -m0755 src/tools/convertkey.py debian/python-potr/usr/bin/convertkey
 
 override_dh_auto_clean:
 	dh_auto_clean

Reply via email to