Correctly pass path to dch

i'm unconvinced this actually fixes any existing problem, and breaks functionality (ie, if you hardcode to look for debian/changelog and debian/control, or changelog & control, it wont scan directories and determine where the changelog is).

I suspect there's something wrong with Laurent's script - i've set up a debian dir in the same way (not named debian), and it still works fine without the --changelog section.

The path are already hardcodded in the update-maintainer script, I personally don't see any harm in this patch, since the script doesn't auto-dectect path and must already be launched in the debian dir or in the top-level directory of the sources

Can you perhaps explain in more details what is the bug that will be solved by this Laurent?

I'm currently maintaining packages (telepathy related packages) that use bzr as VCS. All the packages have the same layout, all the debian files are put at the top level of the branch.

If I run update-maintainer in one of this branch, it will currently fails because dch will search my changelog file by looking for debian/changelog.

My patch pass the changelog path, by using $DEBIANDIR which is set according by looking if you're already in the debian dir

Couldn't this also be solved by using the CHANGELOG environment variable?

It could be but it will prevent dch to automatically search the changelog file in other case

Yes, you would have to set it manually or with some script only in that particular case you are having problems.
On the other hand with your change is the tool that will loose that ability.
Can you check what Lutin thinks about it?

No it don't.
update-maintainer already needs to be run in the debian dir or at the top level of the sources

# look for the debian directory
if [ -f debian/control -a -f debian/changelog ]; then
    DEBIANDIR=debian
elif [ -f control -a -f changelog ]; then
    DEBIANDIR=.
else
    echo "Please execute «$0» in the source folder." >&2 && exit 1
fi

Is this getting committed to ubuntu-dev-tools at least?

Commited to the ubuntu-dev-tool bzr.
Thanks for the patch :)

ubuntu-dev-tools (0.15) gutsy; urgency=low

  [ Laurent Bigonville ]
  * update-maintainer: correctly pass path to dch (LP: #141015)

  [ Daniel Holbach ]
  * ppaput:
    - fix indentation issues.
    - now respects the PPA section the package goes to (LP: #146161)
    - add comment to bug about how to test the resulting .deb (LP: #145895)

 -- Daniel Holbach <email address hidden> Mon, 01 Oct 2007 15:56:18 +0200