[procps] Re: first part of nls
- From: Craig Small <csmall-procps@xxxxxxxxxx>
- To: procps@xxxxxxxxxxxxx
- Date: Thu, 22 Dec 2011 13:04:37 +1100
On Wed, Dec 21, 2011 at 02:20:36PM -0600, Jim Warner wrote:
>
> On Dec 21, 2011, at 2:16 PM, Craig Small wrote:
>
> > It's merged merry Chirstmas.
> > However the patches were missing the po file and associated structures
> > for gettext so it won't configure. I've run out of time to nick that
> > stuff from your nls branch.
>
> It does not appear to be merged, and my patches cannot be applied first.
It's not but it can be done afterwards. I tried it on a separate clone
and it worked fine with a few conflict tweaks. Here is git lola
* 4f68c4e (HEAD, master) Merge remote-tracking branch 'sami/nls'
|\
| * a102824 (sami/nls) sysctl: enable pattern matching with path
| * 5862f47 watch: use strtod_or_err() to validate user input
| * 208a043 tload: validate scale argument
[then a whole lot more of sami's stuff]
| * d508847 pmap: new usage & fix coding style
| * 6dd0924 watch: new usage & fix coding style
* | 4ece57b (origin/master, origin/HEAD) Fixed some build conflicts wrt NLS
* | 3ae8dcf top: streamlined creation of nls string tables
* | a22f1ea top: repositioned nls.h to avoid redefine of procps.h restrict
[then all of your top stuff]
* | b572c9c top: add gettext support
* | 1faf4a0 top: with lib xalloc changes, restored prior memory logic
|/
* 2865ded Removed xalloc type functions from library
* 562b4a0 Added news item for top search capability
* ff67012 top: update man document for new search capability
* d6e6a9a top: add a search capability
That looks right, it compiles and has the history.
As far as 31 patches versus 25, I only got 25.
It looks like the history was
top_nls
sami_nls
and now it is
sami_nls
top_nls
but it is all there.
- Craig
--
Craig Small VK2XLZ http://enc.com.au/ csmall at : enc.com.au
Debian GNU/Linux http://www.debian.org/ csmall at : debian.org
GPG fingerprint: 5D2F B320 B825 D939 04D2 0519 3938 F96B DF50 FEA5
Other related posts:
