[Pkg-shadow-devel] Policy for patches in the sid branch

[Nicolas François]

Hi!

On Thu, Apr 14, 2005 at 11:34:17PM +0300, Alexander Gattin wrote:
> On Thu, Apr 14, 2005 at 11:48:03AM +0200, Nicolas François wrote:
> >  * a new temporary directory is created and a new shell is invoked
> >    in this directory (by dpatch-edit-patch).
> >    I'm doing my modifications there.
> >  * then I exit from this new shell
> >  * and dpatch-edit-patch automagically creates the
> 
> voila!
> :^)
> 
> If you didn't tell this, I'd probably use
> `cvs diff/rdiff`, vim and dpatch-convert-diffgz :)

Cool. So it seems that it is also working for somebody else.
I definitely need to document this.


I've started using the CVS:
Here is what was committed:
 * a split of 008_src into 008_src and 401_cppw_src and 008_src

 * add a 402_missing_debian_man_pages

 * add the 00list file
   patches that do not belong to 31sarge2 are commented. They won't be
   applied after automatically if you don't uncomment them.

 * add a 317_lastlog_usage_249611
   (I assumed this patch will be applied upstream, anyway it will be
   merged with Tomasz when we will merge the translations)



I've tried to make some diff with 31sarge2. Here is the diff command I
used:
diff --exclude=CVS --exclude=patched --exclude=patches \
     --ignore-matching-lines="\$Id:.*\$" -rNau \
     31sarge2_dir \
     work_dir

The remaining diff (after a dpatch apply-all) are:
  * some patches applied to debian files
  * automatically generated files (aclocal.m4, config.{guess,h.in,sub},
    configure, configure.in, */Makefile.in, getdate.c
  * COPYING file is missing
The following may need some work:
  * debian/po/de.po
    Christian, do you remember having changed something there recently?
  * debian/changelog (some lines were removed in old changes and some date
    of upload too)
  * man/fr/po4a
    (probably due to a re-generation of the french man pages)
    not worrysome
  * po/shadow.pot
    not worrysome (date an line references changed + a msgid changed)


> P.S. Also, what is the policy for patching
> Debian-specific stuff, like remove-shell? I just
> changed the file in CVS under pkg-shadow/sid/
> directory.
> 
> We should rather document this.

Yes, the diff showed this.

IMO, this is OK at least as soon as the diff in very small.
So that we will be able to review the difference between the generated
package with dpatch and 31sarge2.


Kind Regards,
-- 
Nekral