Thanks I've applied patches 1, 4 and 5 for now. I think the copyright one should be just merged into a single license. And see Alan's comment on 3/5.
Cheers, Peter On Sat, Jun 18, 2011 at 02:41:31PM -0400, Gaetan Nadon wrote: > Signed-off-by: Gaetan Nadon <[email protected]> > --- > man/Makefile.am | 20 +------------------- > 1 files changed, 1 insertions(+), 19 deletions(-) > > diff --git a/man/Makefile.am b/man/Makefile.am > index 6608ff7..6591fe7 100644 > --- a/man/Makefile.am > +++ b/man/Makefile.am > @@ -19,33 +19,15 @@ > # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR > # PERFORMANCE OF THIS SOFTWARE. > > - > appmandir = $(APP_MAN_DIR) > appman_PRE = xinput.man > appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) > > EXTRA_DIST = $(appman_PRE) > CLEANFILES = $(appman_DATA) > - > -# Strings to replace in man pages > -XORGRELSTRING = @PACKAGE_STRING@ > - XORGMANNAME = X Version 11 > - > -MAN_SUBSTS = \ > - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ > - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ > - -e 's|__xservername__|Xorg|g' \ > - -e 's|__xconfigfile__|xorg.conf|g' \ > - -e 's|__projectroot__|$(prefix)|g' \ > - -e 's|__apploaddir__|$(appdefaultdir)|' \ > - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ > - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ > - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ > - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ > - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' > - > SUFFIXES = .$(APP_MAN_SUFFIX) .man > > +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via > configure > .man.$(APP_MAN_SUFFIX): > $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ > > -- > 1.7.4.1 > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
