Re: [Monotone-debian] Uploading 0.42 for squeeze, and structure of the debian branch

[Zack Weinberg]

On Tue, Feb 17, 2009 at 9:58 AM, Richard Levitte <address@hidden> wrote:
>
> Hmmm, in said package (damn if I remember which one it was, all I
> remember is hell), it seemed that the patching from debian/patches
> were applied after a round of autoconf..

I wouldn't have any hesitation to call such a debian/rules buggy :-)

> zackw> Because the Attic files *aren't in the tarball*
>
> D'uh on me ;-)
>
> At this point, you got me convinced...  :-)
>
> Thanks for wanting to talk about it.

No problem.

I *wanted* to do a quick upload to unstable of the 0.42 release before
making any dramatic changes to the packaging, but there are ...
problems.  I didn't realize when I checked in the 0.42-2 candidate
changes that there had been a merge from mainline to .debian-diff
since 0.42 - that's not a big deal.  Of rather more concern is that
there's all kinds of files in nvm.debian-diff (even at
t:monotone-0.42-1) that are not in the official tarball, and vice
versa:

Only in S-debian/botan: credits.txt
Only in S-debian/botan: info.txt
Only in S-debian/botan: license.txt
Only in S-debian/botan: README.botan-monotone
Only in S-debian/botan: thanks.txt
Only in S-debian/contrib: asciik.py
Only in S-debian/contrib: ChangeLog.sh
Only in monotone-0.42/contrib/command: changed_files.lua
Only in S-debian/contrib: dtrace2calltree.py
Only in S-debian/contrib: dump-test-logs.sh
Only in S-debian/contrib: ext_hooks_expand.pl
Only in S-debian/contrib: ext_hooks.lua.in
Only in S-debian/contrib: lua-mode.el
Only in S-debian/contrib: monotone-mail-notify.sh
Only in S-debian/contrib: monotone-mirror-postaction-push.sh
Only in S-debian/contrib: monotone-mirror-postaction-update.sh
Only in S-debian/contrib: monotone-mirror.sh
Only in S-debian/contrib: mtn_cheat_sheet.svg
Only in S-debian/contrib: mtn_makepermissions
Only in S-debian/contrib: op2calltree.py
Only in S-debian/contrib: parse-accounting.pl
Only in S-debian/contrib: perf-test.sh
Only in S-debian/contrib: README.missing
Only in S-debian/contrib: recreate-manifest-tables.sh
Only in S-debian: cygwin
Only in S-debian: do-editor-vars.sh
Only in S-debian: doxygen.cfg
Only in S-debian/figures: monotone-logo.svg
Only in S-debian/figures: oo-figures.sxd
Only in S-debian/figures: pdfcrop.pl
Only in S-debian/figures: README
Only in S-debian: HACKING
Only in S-debian: indent_script
Only in S-debian/mac: readme-mac.txt
Only in monotone-0.42: monotone.html
Only in monotone-0.42: monotone.info
Only in monotone-0.42: monotone.info-1
Only in monotone-0.42: monotone.info-2
Only in monotone-0.42: monotone.info-3
Only in monotone-0.42: mtnopt
Only in S-debian: notes
Only in monotone-0.42: package_full_revision.c
Only in monotone-0.42: package_full_revision_dist.txt
Only in monotone-0.42: package.m4
Only in monotone-0.42: package_revision.c
Only in monotone-0.42: package_revision.txt
Only in S-debian/pcre: README
Only in monotone-0.42/po: de.gmo
Only in monotone-0.42/po: es.gmo
Only in S-debian/po: fr.po
Only in monotone-0.42/po: it.gmo
Only in S-debian/po: ja.po
Only in monotone-0.42/po: monotone.pot
Only in S-debian/po: POTFILES.skip
Only in S-debian/po: pt_BR.po
Only in S-debian/po: README
Only in monotone-0.42/po: sv.gmo
Only in S-debian: README.visualc8
Only in monotone-0.42: stamp-vti
Only in monotone-0.42/tests/clone_branch_no_dir: __driver__.lua~
Only in monotone-0.42/tests/clone_creates__MTN_log: __driver__.lua~
Only in monotone-0.42/tests/clone_creates_right__MTN_options: __driver__.lua~
Only in monotone-0.42/tests/clone_validates_target_directory: __driver__.lua~
Only in monotone-0.42/tests/clone_warning_with_multiple_heads: __driver__.lua~
Only in monotone-0.42/tests/common: automate_stdio.lua~
Only in monotone-0.42/tests/default_command_options: default_options.lua~
Only in monotone-0.42/tests/default_command_options: __driver__.lua~
Only in monotone-0.42/tests/netsync_stops_on_key_id_clash: wrong_key.txt
Only in monotone-0.42/tests/p_selector: __driver__.lua~
Only in monotone-0.42/tests/restricted_diff_bug: __driver__.lua~
Only in monotone-0.42/tests/restricted_diff_bug: .___driver__.lua
Only in monotone-0.42/tests/revert_contents_not_parent_rename: __driver__.lua~
Only in monotone-0.42/tests/revert_contents_not_parent_rename: .___driver__.lua
Only in monotone-0.42/tests/revert_drop_not_rename: __driver__.lua~
Only in monotone-0.42/tests/revert_drop_not_rename: .___driver__.lua
Only in monotone-0.42/tests/two_parent_workspace_commands_that_fail:
__driver__.lua~
Only in monotone-0.42/tests/user_commands: __driver__.lua~
Only in monotone-0.42/tests/user_commands: extra_rc~
Files monotone-0.42/texinfo.tex and S-debian/texinfo.tex differ
Only in S-debian/unix: README
Only in monotone-0.42: version.texi
Only in S-debian: visualc
Only in S-debian/win32: monotone.bmp
Only in S-debian/win32: README

This actually looks to me like the generation of the monotone-0.42
tarball was hosed -- we have *editor backup files* in there for
heavens' sake, and just about everything listed as "only in S-debian"
*should have* been in the tarball.  I'm baffled that "make distcheck"
didn't catch this stuff.

I don't know how to proceed here :-(

zw