[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

Re: [tor-bugs] #1735 [Tor - Tor client]: Decide what to do with the debian/ directory in Tor

#1735: Decide what to do with the debian/ directory in Tor
------------------------------+---------------------------------------------
 Reporter:  Sebastian         |       Owner:  weasel            
     Type:  task              |      Status:  assigned          
 Priority:  normal            |   Milestone:  Tor: 0.2.2.x-final
Component:  Tor - Tor client  |     Version:                    
 Keywords:                    |      Parent:                    
------------------------------+---------------------------------------------

Comment(by weasel):

 Tor still periodicly merges the entire 0.2.<old> branch into master.

 That means any changes that got merged to that branch's debian directory
 would somehow make it to master.  This is something we do not want.

 We could do debian-<branch> directories in each branch, but that's ugly;
 let's not do that.

 So we cannot keep the debian/ directory in the maintenance branches
 current, which probably means it should just go away.

 Therefore we probably want a documented way that ioerr^Wusers can get
 a debian/ dir anyway.

 There are two options I can think of immediately:
 - Have a git repository with just the debian/ directory.  Users clone
   that and put that in their tor code directory as debian.  Maybe
   externals could help here?  How do users keep things in sync?
 - What we have right now: a git repository that is a clone of tor's.
   Different branches for different distributions
   (stable/unstable/experimental...).
   These git trees hold tor plus all debian specific changes in the
   debian/ directory.  Users just merge these into their working
   copy if they want a debian dir.

 So if there is no debian dir in the maintenance branches, should there
 be one in master?  It'd mean two different sets of instructions
 depending on which branch a user is on.  And the master branch does not
 keep itself current either.

-- 
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/1735#comment:6>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
_______________________________________________
tor-bugs mailing list
tor-bugs@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs