#1454 closed defect (fixed)

remove misc/debian or sync it from Debian

Reported by: zooko Owned by: warner
Priority: minor Milestone: 1.9.0
Component: packaging Version: 1.8.2
Keywords: packaging debian review-needed Cc: warner
Launchpad Bug:

Description

Now that Debian packages Tahoe-LAFS, we should probably remove the misc/debian and misc/debian_helpers, or else make sure that the tools/scripts/config-files that Debian itself uses doesn't differ from those.

Attachments (4)

rm-misc-debian-and-debian_helpers.darcs.patch (144.2 KB) - added by davidsarah at 2011-07-29T03:03:01Z.
Remove misc/debian and misc/debian_helpers, which are out-of-date relative to the official Debian packages. fixes #1454
debian.rst (2.1 KB) - added by warner at 2011-08-01T01:54:03Z.
replacement docs
remove-debian-build-targets.darcs.patch (32.4 KB) - added by davidsarah at 2011-08-01T04:22:56Z.
Makefile: remove targets that used misc/debian[_helpers] which no longer exist. Also change docs/debian.rst to reflect the fact that we no longer support building .debs using those targets. refs #1454
simplify-makefile-and-setup-py.darcs.patch (27.7 KB) - added by davidsarah at 2011-08-01T04:24:29Z.
Makefile and setup.py: remove setup.py commands that we no longer need, and their uses in the Makefile. Delete a stale and incorrect comment about updating _version.py. Also fix some coding style checks in the Makefile to operate on all source files. (This isn't strictly to do with #1454, but since it also touches the Makefile I'll put it here.)

Download all attachments as: .zip

Change History (16)

comment:1 Changed at 2011-07-29T02:57:06Z by davidsarah

+1 on removing these directories. I think we should do that for 1.9.

Changed at 2011-07-29T03:03:01Z by davidsarah

Remove misc/debian and misc/debian_helpers, which are out-of-date relative to the official Debian packages. fixes #1454

comment:2 Changed at 2011-07-29T03:03:32Z by davidsarah

  • Keywords review-needed added
  • Milestone changed from undecided to 1.9.0

comment:3 follow-up: Changed at 2011-07-31T19:51:24Z by warner

+1 for me too. It means we must shut down our .deb-producing buildbots, and devs/bleeding-edge-users can no longer get convenient debian packages of current trunk (instead they must apply the official debian .diff.gz to their source tree and build a .deb from that, and since that .diff probably clobbers a bunch of the setuptools weirdness in setup.py it may be a one-way operation).

Also it means that users of non-current debian/ubuntu OSes won't be able to get debian packages at all: the current debian diff might not work for them, and we aren't providing anything better.

But we aren't testing or maintaining this stuff, so I expect it probably doesn't work already. And I'm not using a debian box on a daily basis anymore, so it's not as important to me anyways :).

I can't tell just by looking at the patch what exactly it removes. (lsdiff or diffstat are great tools, but don't work on darcs patches). So I'll take your word that it's the equivalent of 'rm -r misc/debian misc/debian_helpers'. Also it should remove the debian portions of the Makefile (everything from line 259 to the end of the file).

It should also update docs/debian.rst: replace the instructions about building a debian package to say "get the diff from packages.debian.org and use debuild as usual". It should keep the section on the debian-package names of Tahoe's dependencies, but should no longer claim that tahoe's source tree will help you build debian packages itself.

comment:4 in reply to: ↑ 3 Changed at 2011-07-31T21:12:08Z by davidsarah

  • Owner changed from somebody to davidsarah
  • Status changed from new to assigned

#1424 was a duplicate of this ticket.

Replying to warner:

+1 for me too. It means we must shut down our .deb-producing buildbots, and devs/bleeding-edge-users can no longer get convenient debian packages of current trunk (instead they must apply the official debian .diff.gz to their source tree and build a .deb from that, and since that .diff probably clobbers a bunch of the setuptools weirdness in setup.py it may be a one-way operation).

... but see #1168 for a way to stop that being one-way.

If we abandon the ability to automatically produce bleeding-edge .debs, I think that means that we could close #299, #423, #769, #1257, #1308, and #1348.

Also it means that users of non-current debian/ubuntu OSes won't be able to get debian packages at all: the current debian diff might not work for them, and we aren't providing anything better.

But we aren't testing or maintaining this stuff, so I expect it probably doesn't work already.

Right, as evidenced by the above tickets :-)

And I'm not using a debian box on a daily basis anymore, so it's not as important to me anyways :).

I can't tell just by looking at the patch what exactly it removes. (lsdiff or diffstat are great tools, but don't work on darcs patches). So I'll take your word that it's the equivalent of 'rm -r misc/debian misc/debian_helpers'.

It is.

Also it should remove the debian portions of the Makefile (everything from line 259 to the end of the file).

It should also update docs/debian.rst: replace the instructions about building a debian package to say "get the diff from packages.debian.org and use debuild as usual". It should keep the section on the debian-package names of Tahoe's dependencies, but should no longer claim that tahoe's source tree will help you build debian packages itself.

OK, I'll update it to do these things.

Changed at 2011-08-01T01:54:03Z by warner

replacement docs

Changed at 2011-08-01T04:22:56Z by davidsarah

Makefile: remove targets that used misc/debian[_helpers] which no longer exist. Also change docs/debian.rst to reflect the fact that we no longer support building .debs using those targets. refs #1454

Changed at 2011-08-01T04:24:29Z by davidsarah

Makefile and setup.py: remove setup.py commands that we no longer need, and their uses in the Makefile. Delete a stale and incorrect comment about updating _version.py. Also fix some coding style checks in the Makefile to operate on all source files. (This isn't strictly to do with #1454, but since it also touches the Makefile I'll put it here.)

comment:5 Changed at 2011-08-01T04:28:00Z by davidsarah

  • Owner changed from davidsarah to warner
  • Status changed from assigned to new

comment:6 Changed at 2011-08-11T17:33:12Z by warner

I cannot apply the rm-misc-debian.. patch: it depends upon MDMF. Could you create an alternate form which does not?

comment:7 Changed at 2011-08-11T18:39:55Z by warner

Nevermind.. I made a new patch for that. I'm +1 on the two debian patches, will land them now. I'm going to move the third non-debian patch out to a different ticket and review it separately.

comment:8 Changed at 2011-08-11T18:40:24Z by david-sarah@…

In 4d58e7cef9569b12:

Makefile: remove targets that used misc/debian[_helpers] which no longer exist. Also change docs/debian.rst to reflect the fact that we no longer support building .debs using those targets. refs #1454

comment:9 Changed at 2011-08-11T18:40:24Z by warner@…

  • Resolution set to fixed
  • Status changed from new to closed

In 37cd111009d0b30e:

remove misc/debian[_helpers], rely upon official packaging instead. fixes #1454

comment:10 Changed at 2011-08-11T18:43:46Z by warner

third patch moved to ticket #1479

comment:11 Changed at 2011-08-16T22:53:44Z by david-sarah@…

In [5181/ticket393-MDMF-2]:

Makefile: remove targets that used misc/debian[_helpers] which no longer exist. Also change docs/debian.rst to reflect the fact that we no longer support building .debs using those targets. refs #1454

comment:12 Changed at 2011-08-16T22:53:44Z by warner@…

In [5182/ticket393-MDMF-2]:

remove misc/debian[_helpers], rely upon official packaging instead. fixes #1454

Note: See TracTickets for help on using tickets.