[Piuparts-devel] more merging

Andreas Beckmann debian at abeckmann.de
Sat Nov 26 12:59:06 UTC 2011


On 2011-11-25 19:08, Andreas Beckmann wrote:
> On 2011-11-25 17:52, Holger Levsen wrote:
>>> PS: all my branches have been rebased to solve any merge problems that
>>> may have occurred after the previous merges
>>
>> seems you forgot the cleanup branches?! 
> 
> For now I just updated
>   cleanup/scriptsdir-check

after that has been merged (and Scotts patch for idleness detection)

here are three new branches (actually only one branch (anbe3) with 2
intermediate endpoints anbe, anbe2)) where I merged some of may trivial
fixes and trivial cleanup into one and added appropriate changelog entries

  git://github.com/anbe42/piuparts.git anbe
  git://github.com/anbe42/piuparts.git anbe2
  git://github.com/anbe42/piuparts.git anbe3

Andreas Beckmann (11):
      .gitignore for files generated by make install
      update changelog entries for my changes
      create /etc/dpkg/dpkg.cfg.d/ if missing
          (fix/647752-missing-dpkg.cfg.d)
      remove logrotate (and dependencies) only once
          (fix/purge-logrotate-once)
      add changelog entries
anbe ends here
      use chroot.relative() more often to build filenames
          (cleanup/use-chroot-relative)
      consolidate apt-get {update,clean}
          (cleanup/apt-get-update-clean)
      add changelog entries
      cleanup changelog entries for Scott
anbe2 ands here
      synchronize cleanup checks between install_{purge,upgrade}_test
      add changelog entry
anbe3 ends here

For the feature branches - which ones would you like to see going in first?

Andreas



More information about the Piuparts-devel mailing list