Bug#740161: patch for 740161
Piotr Ożarowski: >>> Please let me know if there's something wrong with my last patch >>> (https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=740161;filename=740161.patch;msg=21) >>> and I will try to update it. >>> >> Jakub Wilk had some remarks in comment #10[1], which I presume is >> relevant for this bug being reopened. Long story short, the file your >> patch touched is auto-generated and manual changes to it are lost. > > my second patch also updates data/debhelper/dh_commands-manual > > I'm attaching one without data/debhelper/dh_commands (if that's the > problem) > Hi Piotr, Thanks for the new patch. I hadn't noticed the second patch at all. The mail with that attachment did not appear in full in the bug log (presumably because the bug was archived at that time and the BTS processes the "unarchive" too late for that case). I had casually assumed that your latter mail referenced the original patch - my apologies for that assumption. I am reviewing your patch now. Thanks, ~Niels
Bug#740161: patch for 740161
> > Please let me know if there's something wrong with my last patch
> > (https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=740161;filename=740161.patch;msg=21)
> > and I will try to update it.
> >
> Jakub Wilk had some remarks in comment #10[1], which I presume is
> relevant for this bug being reopened. Long story short, the file your
> patch touched is auto-generated and manual changes to it are lost.
my second patch also updates data/debhelper/dh_commands-manual
I'm attaching one without data/debhelper/dh_commands (if that's the
problem)
commit 20c7b86cf98e803af9d97938870399e1c5e7d482
Author: Piotr Ozarowski <p...@ypsilon.net>
Date: Thu Dec 1 18:39:34 2016 +0100
dh_python{2,3} are now in dh-python package
python package provides an older copy of dh_python2 (and a wrapper that
detects dh-python build dependency) and python3 package depends on
dh-python but I'd like to drop both of these transitional workarounds at
some point (when all packages build depend on dh-python)
diff --git a/data/debhelper/dh_commands-manual b/data/debhelper/dh_commands-manual
index 9d2ccc1..d9769e5 100644
--- a/data/debhelper/dh_commands-manual
+++ b/data/debhelper/dh_commands-manual
@@ -17,8 +17,8 @@ dh_autoreconf_clean||dh-autoreconf | debhelper (>= 9.20160403~)
dh_autoreconf||dh-autoreconf | debhelper (>= 9.20160403~)
dh_lv2config||lv2core
dh_nativejava||gcj-native-helper | default-jdk-builddep
-dh_python2||python:any | python-all:any | python-dev:any | python-all-dev:any
-dh_python3||python3:any | python3-all:any | python3-dev:any | python3-all-dev:any
+dh_python2||dh-python
+dh_python3||dh-python
dh_sphinxdoc||python-sphinx | python3-sphinx
dh_systemd_enable||debhelper (>= 9.20160709~) || dh-systemd
dh_systemd_start||debhelper (>= 9.20160709~) || dh-systemd
Bug#740161: patch for 740161
On Mon, 29 Aug 2016 14:06:55 +0200 Piotr =?utf-8?Q?O=C5=BCarowski?= <pi...@debian.org> wrote: > Please let me know if there's something wrong with my last patch > (https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=740161;filename=740161.patch;msg=21) > and I will try to update it. > > Hi, Jakub Wilk had some remarks in comment #10[1], which I presume is relevant for this bug being reopened. Long story short, the file your patch touched is auto-generated and manual changes to it are lost. Thanks, ~Niels [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=740161#10
Bug#740161: patch for 740161
Please let me know if there's something wrong with my last patch (https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=740161;filename=740161.patch;msg=21) and I will try to update it.
