mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

Update of /cvsroot/mingw/mingw-dist
In directory vz-cvs-4.sog:/tmp/cvs-serv3760

Modified Files:
	ChangeLog 
Log Message:
2011-07-31  Chris Sutcliffe  <ir0...@us...>

        Update & publish msys-mintty.

        * msys/msys-mintty.xml: Update to 1.0.1-1.
        * msys/issue.log: Updated accordingly.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** ChangeLog	29 Jul 2011 21:35:59 -0000	1.85
--- ChangeLog	31 Jul 2011 23:32:59 -0000	1.86
***************
*** 1,2 ****
--- 1,9 ----
+ 2011-07-31  Chris Sutcliffe  <ir0...@us...>
+ 
+ 	Update & publish msys-mintty.
+ 
+ 	* msys/msys-mintty.xml: Update to 1.0.1-1.
+ 	* msys/issue.log: Updated accordingly.
+ 
  2011-07-29  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/mingw-dist/mingw32
In directory vz-cvs-4.sog:/tmp/cvs-serv19676/mingw32

Modified Files:
	issue.log mingw32-mingw-get.xml 
Log Message:
Update for mingw-get-0.3-alpha-2.1 release.

Index: mingw32-mingw-get.xml
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/mingw32/mingw32-mingw-get.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mingw32-mingw-get.xml	29 Jul 2011 21:22:30 -0000	1.10
--- mingw32-mingw-get.xml	29 Jul 2011 21:36:00 -0000	1.11
***************
*** 28,56 ****
  
        <component class="bin">
          <release tarname="mingw-get-0.3-mingw32-alpha-2-bin.tar.gz" />
          <release tarname="mingw-get-0.3-mingw32-alpha-1-bin.tar.gz" />
          <release tarname="mingw-get-0.2-mingw32-alpha-4-bin.tar.gz" />
-         <release tarname="mingw-get-0.2-mingw32-alpha-3-bin.tar.gz" />
-         <release tarname="mingw-get-0.2-mingw32-alpha-2-bin.tar.gz" />
-         <release tarname="mingw-get-0.2-mingw32-alpha-1-bin.tar.gz" />
-         <release tarname="mingw-get-0.1-mingw32-alpha-5.2-bin.tar.gz" />
-         <release tarname="mingw-get-0.1-mingw32-alpha-5.1-bin.tar.gz" />
-         <release tarname="mingw-get-0.1-mingw32-alpha-5-bin.tar.gz" />
-         <release tarname="mingw-get-0.1-mingw32-alpha-4-bin.tar.gz" />
-         <release tarname="mingw-get-0.1-mingw32-alpha-3-bin.tar.gz" />
        </component>
  
        <component class="lic">
          <release tarname="mingw-get-0.3-mingw32-alpha-2-lic.tar.gz" />
          <release tarname="mingw-get-0.3-mingw32-alpha-1-lic.tar.gz" />
          <release tarname="mingw-get-0.2-mingw32-alpha-4-lic.tar.gz" />
-         <release tarname="mingw-get-0.2-mingw32-alpha-3-lic.tar.gz" />
-         <release tarname="mingw-get-0.2-mingw32-alpha-2-lic.tar.gz" />
-         <release tarname="mingw-get-0.2-mingw32-alpha-1-lic.tar.gz" />
-         <release tarname="mingw-get-0.1-mingw32-alpha-5.2-lic.tar.gz" />
-         <release tarname="mingw-get-0.1-mingw32-alpha-5.1-lic.tar.gz" />
-         <release tarname="mingw-get-0.1-mingw32-alpha-5-lic.tar.gz" />
-         <release tarname="mingw-get-0.1-mingw32-alpha-4-lic.tar.gz" />
-         <release tarname="mingw-get-0.1-mingw32-alpha-3-lic.tar.gz" />
        </component>
      </package>
--- 28,42 ----
  
        <component class="bin">
+         <release tarname="mingw-get-0.3-mingw32-alpha-2.1-bin.tar.xz" />
          <release tarname="mingw-get-0.3-mingw32-alpha-2-bin.tar.gz" />
          <release tarname="mingw-get-0.3-mingw32-alpha-1-bin.tar.gz" />
          <release tarname="mingw-get-0.2-mingw32-alpha-4-bin.tar.gz" />
        </component>
  
        <component class="lic">
+         <release tarname="mingw-get-0.3-mingw32-alpha-2.1-lic.tar.xz" />
          <release tarname="mingw-get-0.3-mingw32-alpha-2-lic.tar.gz" />
          <release tarname="mingw-get-0.3-mingw32-alpha-1-lic.tar.gz" />
          <release tarname="mingw-get-0.2-mingw32-alpha-4-lic.tar.gz" />
        </component>
      </package>
***************
*** 75,85 ****
  
        <component class="bin">
          <release tarname="pkginfo-0.3-mingw32-alpha-2-bin.tar.gz" />
          <release tarname="pkginfo-0.3-mingw32-alpha-1-bin.tar.gz" />
          <release tarname="pkginfo-0.2-mingw32-alpha-4-bin.tar.gz" />
-         <release tarname="pkginfo-0.2-mingw32-alpha-3-bin.tar.gz" />
-         <release tarname="pkginfo-0.2-mingw32-alpha-2-bin.tar.gz" />
-         <release tarname="pkginfo-0.1-mingw32-alpha-5.2-bin.tar.gz" />
-         <release tarname="pkginfo-0.1-mingw32-alpha-4-bin.tar.gz" />
        </component>
      </package>
--- 61,68 ----
  
        <component class="bin">
+         <release tarname="pkginfo-0.3-mingw32-alpha-2.1-bin.tar.xz" />
          <release tarname="pkginfo-0.3-mingw32-alpha-2-bin.tar.gz" />
          <release tarname="pkginfo-0.3-mingw32-alpha-1-bin.tar.gz" />
          <release tarname="pkginfo-0.2-mingw32-alpha-4-bin.tar.gz" />
        </component>
      </package>

Index: issue.log
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/mingw32/issue.log,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** issue.log	29 Jul 2011 21:22:30 -0000	1.37
--- issue.log	29 Jul 2011 21:36:00 -0000	1.38
***************
*** 43,47 ****
    cd96b5759d4b1bc19c4e71c5c35980092659c2f8 2010092500 mingw32-libtool.xml
    0f5fd373c90d9acc6cd7f63120375707b81d4fb5 2011012200 mingw32-make.xml
!   068c1db0536da6c032fe926c2884d5734f5f51db 2011061700 mingw32-mingw-get.xml
    3dff337479c4ce7122fdfb0c194146fe2e47c74b 2010090600 mingw32-mingw-utils.xml
    397021010754b50cdbbe5d5003b1f6217158ec8e 2010083100 mingw32-mpc.xml
--- 43,47 ----
    cd96b5759d4b1bc19c4e71c5c35980092659c2f8 2010092500 mingw32-libtool.xml
    0f5fd373c90d9acc6cd7f63120375707b81d4fb5 2011012200 mingw32-make.xml
!   052e69a091c126287d63261ac95d2891db5f1688 2011072900 mingw32-mingw-get.xml
    3dff337479c4ce7122fdfb0c194146fe2e47c74b 2010090600 mingw32-mingw-utils.xml
    397021010754b50cdbbe5d5003b1f6217158ec8e 2010083100 mingw32-mpc.xml

Update of /cvsroot/mingw/mingw-dist
In directory vz-cvs-4.sog:/tmp/cvs-serv14329

Modified Files:
	ChangeLog 
Log Message:
Update for mingw-get-0.3-alpha-2 release.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** ChangeLog	12 Jul 2011 01:34:19 -0000	1.83
--- ChangeLog	29 Jul 2011 21:22:29 -0000	1.84
***************
*** 9,12 ****
--- 9,19 ----
  	* mingw32/issue.: Update accordingly.
  
+ 2011-06-17  Keith Marshall  <kei...@us...>
+ 
+ 	Update for mingw-get-0.3-alpha-2 release.
+ 
+ 	* mingw32/mingw32-mingw-get.xml: Add release entries.
+ 	* mingw32/issue.log: Update accordingly.
+ 
  2011-06-05  Earnie Boyd  <ea...@us...>
  

Update of /cvsroot/mingw/mingw-get
In directory vz-cvs-4.sog:/tmp/cvs-serv30566

Modified Files:
	ChangeLog configure.ac 
Log Message:
mingw-get-0.3-mingw32-alpha-2.1 released.

Index: configure.ac
===================================================================
RCS file: /cvsroot/mingw/mingw-get/configure.ac,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** configure.ac	17 Jun 2011 07:02:18 -0000	1.19
--- configure.ac	29 Jul 2011 20:21:57 -0000	1.20
***************
*** 23,27 ****
  # arising from the use of this software.
  #
!   AC_INIT([mingw-get],[0.3-alpha-2],[http://mingw.org/Reporting_Bugs])
  
    AC_SUBST([COPYRIGHT_HOLDER],["MinGW Project"])
--- 23,27 ----
  # arising from the use of this software.
  #
!   AC_INIT([mingw-get],[0.3-alpha-2.1],[http://mingw.org/Reporting_Bugs])
  
    AC_SUBST([COPYRIGHT_HOLDER],["MinGW Project"])

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** ChangeLog	29 Jul 2011 19:52:31 -0000	1.111
--- ChangeLog	29 Jul 2011 20:21:57 -0000	1.112
***************
*** 1,4 ****
--- 1,12 ----
  2011-07-29  Keith Marshall  <kei...@us...>
  
+ 	mingw-get-0.3-mingw32-alpha-2.1 released.
+ 
+ 	* configure.ac (AC_INIT): Adjust version number.
+ 	* srcdist-doc/NEWS.in: Updated; document bugs fixed.
+ 	* All files (r0-3-alpha-2-1): Tag assigned.
+ 
+ 2011-07-29  Keith Marshall  <kei...@us...>
+ 
  	Adopt tar.xz as default package archive format.
  

Update of /cvsroot/mingw/mingw-get
In directory vz-cvs-4.sog:/tmp/cvs-serv22346

Modified Files:
	ChangeLog Makefile.in 
Log Message:
Adopt tar.xz as default package archive format.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/mingw-get/Makefile.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Makefile.in	18 Jun 2011 12:32:23 -0000	1.29
--- Makefile.in	29 Jul 2011 19:52:32 -0000	1.30
***************
*** 177,187 ****
  dist: srcdist bindist readme.txt
  
  bindist: all licdist
  	rm -rf staged
  	$(MAKE) --no-print-directory prefix=`pwd`/staged install-strip
! 	cd staged; tar chf - bin/pkginfo$(EXEEXT) | gzip -c > \
! 	  ../pkginfo-$(PACKAGE_DISTVERSION)-bin.tar.gz
  	rm staged/bin/pkginfo$(EXEEXT)
! 	cd staged; tar chf - * | gzip -c > ../$(PACKAGE_DISTNAME)-bin.tar.gz
  	cd staged; zip -r ../$(PACKAGE_DISTNAME)-bin.zip *
  	rm -rf staged
--- 177,194 ----
  dist: srcdist bindist readme.txt
  
+ # Specify default compression command, and associated file name extension,
+ # for creation and identification of packaged tar archives.
+ #
+ TARZIP = xz
+ TAREXT = tar.$(TARZIP)
+ 
  bindist: all licdist
  	rm -rf staged
  	$(MAKE) --no-print-directory prefix=`pwd`/staged install-strip
! 	cd staged; tar chf - bin/pkginfo$(EXEEXT) | $(TARZIP) -c > \
! 	  ../pkginfo-$(PACKAGE_DISTVERSION)-bin.$(TAREXT)
  	rm staged/bin/pkginfo$(EXEEXT)
! 	cd staged; tar chf - * | $(TARZIP) -c > \
! 	  ../$(PACKAGE_DISTNAME)-bin.$(TAREXT)
  	cd staged; zip -r ../$(PACKAGE_DISTNAME)-bin.zip *
  	rm -rf staged
***************
*** 195,199 ****
  	    || $(LN_S) ../$$file .; \
  	  done
! 	tar chf - share | gzip -c > $(PACKAGE_DISTNAME)-lic.tar.gz
  	rm -rf share
  
--- 202,206 ----
  	    || $(LN_S) ../$$file .; \
  	  done
! 	tar chf - share | $(TARZIP) -c > $(PACKAGE_DISTNAME)-lic.$(TAREXT)
  	rm -rf share
  
***************
*** 214,218 ****
  	cd ${CURDIR}; done
  	cd ${PACKAGE_DISTROOT}/src/pkginfo; $(LN_S) ${CURDIR}/$^ .
! 	tar chf - ${PACKAGE_DISTROOT} | gzip -c > ${PACKAGE_DISTNAME}-src.tar.gz
  	rm -rf ${PACKAGE_DISTROOT}
  
--- 221,226 ----
  	cd ${CURDIR}; done
  	cd ${PACKAGE_DISTROOT}/src/pkginfo; $(LN_S) ${CURDIR}/$^ .
! 	tar chf - ${PACKAGE_DISTROOT} | $(TARZIP) -c > \
! 	  ${PACKAGE_DISTNAME}-src.$(TAREXT)
  	rm -rf ${PACKAGE_DISTROOT}
  
***************
*** 286,290 ****
  maintainer-clean: distclean
  	rm -f README NEWS INSTALL readme.txt Makefile pkginfo.c
! 	rm -f *-$(PACKAGE_DISTVERSION)-*.tar.gz *-$(PACKAGE_DISTVERSION)-*.zip
  	rm -rf ${PACKAGE_DISTROOT} staged ${srcdir}/autom4te.cache
  
--- 294,298 ----
  maintainer-clean: distclean
  	rm -f README NEWS INSTALL readme.txt Makefile pkginfo.c
! 	rm -f *-$(PACKAGE_DISTVERSION)-*.tar.* *-$(PACKAGE_DISTVERSION)-*.zip
  	rm -rf ${PACKAGE_DISTROOT} staged ${srcdir}/autom4te.cache
  

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** ChangeLog	27 Jul 2011 20:36:00 -0000	1.110
--- ChangeLog	29 Jul 2011 19:52:31 -0000	1.111
***************
*** 1,2 ****
--- 1,10 ----
+ 2011-07-29  Keith Marshall  <kei...@us...>
+ 
+ 	Adopt tar.xz as default package archive format.
+ 
+ 	* Makefile.in (TARZIP, TAREXT): New macros; define them.
+ 	(bindist, licdist, srcdist): Use them in place of hardcoded tar.gz
+ 	(maintainer-clean): Expunge tar files of any compression format.
+ 
  2011-07-27  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/mingw-get/src
In directory vz-cvs-4.sog:/tmp/cvs-serv1797/src

Modified Files:
	debug.h pkgdeps.cpp pkgexec.cpp pkgreqs.cpp pkgspec.cpp 
Log Message:
Correct handling of release status in requirements specifications.

Index: debug.h
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/debug.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** debug.h	7 Jun 2011 21:03:37 -0000	1.6
--- debug.h	27 Jul 2011 20:36:00 -0000	1.7
***************
*** 70,73 ****
--- 70,74 ----
  
  #  define DEBUG_TRACE_INTERNET_REQUESTS  	0x0100
+ #  define DEBUG_TRACE_DEPENDENCIES	  	0x0200
  
  #  define DEBUG_INHIBIT_RITES_OF_PASSAGE  	0x7000

Index: pkgreqs.cpp
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/pkgreqs.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pkgreqs.cpp	18 May 2011 18:34:51 -0000	1.3
--- pkgreqs.cpp	27 Jul 2011 20:36:00 -0000	1.4
***************
*** 396,407 ****
    clone = inherited( id.GetPackageVersion(), id.GetPackageBuild() );
    if( (clone & INHERIT_VERSION) > INHERIT_NONE )
!     /*
!      * ...propagating its "major.minor.patch" element as required...
       */
      id.SetPackageVersion( dep->GetPackageVersion() );
  
    if( (clone & INHERIT_BUILD) > INHERIT_NONE )
      /*
!      * ...and similarly, its "datestamp-index" element.
       */
      id.SetPackageBuild( dep->GetPackageBuild() );
--- 396,420 ----
    clone = inherited( id.GetPackageVersion(), id.GetPackageBuild() );
    if( (clone & INHERIT_VERSION) > INHERIT_NONE )
!   {
!     /* ...propagating its "major.minor.patch" element as required.
       */
      id.SetPackageVersion( dep->GetPackageVersion() );
  
+     /* We also consider any release status specification to represent
+      * an extension to the normal package version specification, so...
+      */
+     if( id.GetReleaseStatus() == NULL )
+     {
+       /* ...when this isn't explicitly overridden in the requirement
+        * specification, we propagate it, together with any associated
+        * release reference index, from the reference specification.
+        */
+       id.SetReleaseStatus( dep->GetReleaseStatus() );
+       id.SetReleaseIndex( dep->GetReleaseIndex() );
+     }
+   }
    if( (clone & INHERIT_BUILD) > INHERIT_NONE )
      /*
!      * Likewise, for any associated "datestamp-index" element.
       */
      id.SetPackageBuild( dep->GetPackageBuild() );

Index: pkgspec.cpp
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/pkgspec.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pkgspec.cpp	15 Feb 2011 21:39:13 -0000	1.3
--- pkgspec.cpp	27 Jul 2011 20:36:00 -0000	1.4
***************
*** 26,29 ****
--- 26,32 ----
   *
   */
+ #include "dmh.h"
+ #include "debug.h"
+ 
  #include "pkginfo.h"
  #include "pkgkeys.h"
***************
*** 140,143 ****
--- 143,161 ----
  /* Comparison operators...
   */
+ static inline bool
+ is_wildcard_spec( const char *version_number, const char *build_number )
+ {
+   /* Local helper to identify wildcard version specifications, so
+    * we may match them to anything within the version comparator.
+    */
+   register int result = false;
+   register const char *wildcard = build_number;
+   if( wildcard == NULL ) wildcard = version_number;
+   if( wildcard != NULL )
+     while( *wildcard )
+       result = (*wildcard++ == '*');
+   return result;
+ }
+ 
  int pkgSpecs::VersionComparator( pkgSpecs& rhs )
  {
***************
*** 152,162 ****
     * RHS, or greater than zero if the LHS represents a "greater"
     * (i.e. a more recent) version than the RHS.
-    *
-    * Initially, we compare just the package version itself...
     */
!   pkgVersionInfo lhs_version( GetPackageVersion(), GetPackageBuild() );
!   pkgVersionInfo rhs_version( rhs.GetPackageVersion(), rhs.GetPackageBuild() );
!   /*
!    * ...returning immediately, with an appropriate return value,
     * if LHS and RHS versions are distinct.
     */
--- 170,192 ----
     * RHS, or greater than zero if the LHS represents a "greater"
     * (i.e. a more recent) version than the RHS.
     */
!   const char *lhs_version_spec = GetPackageVersion();
!   const char *lhs_build_spec = GetPackageBuild();
! 
!   const char *rhs_version_spec = rhs.GetPackageVersion();
!   const char *rhs_build_spec = rhs.GetPackageBuild();
! 
!   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
!       dmh_printf( "  LHS: %s-%s-%s-%s\n  RHS: %s-%s-%s-%s\n",
! 	lhs_version_spec, lhs_build_spec, GetReleaseStatus(), GetReleaseIndex(),
! 	rhs_version_spec, rhs_build_spec, rhs.GetReleaseStatus(), rhs.GetReleaseIndex())
!       );
! 
!   /* Initially, we compare just the package version itself...
!    */
!   pkgVersionInfo lhs_version( lhs_version_spec, lhs_build_spec );
!   pkgVersionInfo rhs_version( rhs_version_spec, rhs_build_spec );
! 
!   /* ...returning immediately with an appropriate return value,
     * if LHS and RHS versions are distinct.
     */
***************
*** 164,224 ****
    if( lhs_version > rhs_version ) return +1;
  
    /* If we get to here, then the package versions of LHS and RHS
!    * are identically the same; however, we may still be able to
!    * differentiate between them, on the basis of progression in
!    * their respective development (release) status qualifiers.
     */
!   const char *lhs_quality, *rhs_quality;
!   if( (lhs_quality = GetReleaseStatus()) != NULL )
    {
!     /* The LHS entity is qualified as "alpha", "beta", ...
       */
!     if( (rhs_quality = rhs.GetReleaseStatus()) == NULL )
!       /*
!        * ...but the RHS entity is not; we always consider an
!        * unqualified version to implicitly represent "stable",
!        * which is always compared as "more recent" than any
!        * "alpha", "beta" or "rc" qualified release at the
!        * same package version point, so we may immediately
!        * confirm the LHS as the "lesser" release.
         */
!       return -1;
  
!     /* If we still haven't differentiated them, then both LHS
!      * and RHS must be qualified.  Check if we can resolve the
!      * deadlock on the basis of progression of development from
!      * "alpha" through "beta" and "rc" to "stable" phases; (note
!      * that simply checking the initial character of the phase
!      * qualifier indicates the appropriate progression).
!      */
!     int chkval = *lhs_quality - *rhs_quality;
!     if( chkval != 0 ) return chkval;
  
!     /* If we still can't resolve the deadlock, then both LHS
!      * and LHS must be qualified as being in identically the
!      * same development phase, so we must now differentiate
!      * on the basis of progression of the release index...
!      */
!     lhs_version.Reset( GetReleaseIndex() );
!     rhs_version.Reset( rhs.GetReleaseIndex() );
!     /*
!      * ...noting that these progress in the same manner as
!      * the package version number itself.
!      */
!     if( lhs_version < rhs_version ) return -1;
!     if( lhs_version > rhs_version ) return +1;
!   }
  
!   else if( rhs.GetReleaseStatus() != NULL )
!     /*
!      * In this case, the RHS entity is qualified as "alpha",
!      * "beta", ..., but the LHS is not.  Since we've already
!      * determined that both represent the same version of the
!      * package, we may infer that the LHS represents a stable
!      * derivative of the qualified RHS, and thus corresponds
!      * to a more recent release, so return the appropriate
!      * value to indicate LHS > RHS.
!      */
!     return +1;
  
    /* If we get to here, then LHS and RHS represent the same
--- 194,279 ----
    if( lhs_version > rhs_version ) return +1;
  
+   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
+       dmh_printf( "   base versions match\n" )
+     );
+ 
    /* If we get to here, then the package versions of LHS and RHS
!    * are effectively matched; however, unless there is a wildcard
!    * specification in effect, (in which case we have an automatic
!    * match), we may still be able to differentiate between them,
!    * by comparing their respective development (release) status
!    * qualifiers; thus...
     */
!   if( ! is_wildcard_spec( lhs_version_spec, lhs_build_spec )
!   &&  ! is_wildcard_spec( rhs_version_spec, rhs_build_spec )  )
    {
!     /* ...we progress this only when there is no wildcard
!      * specification in effect.
       */
!     const char *lhs_quality, *rhs_quality;
!     if( (lhs_quality = GetReleaseStatus()) != NULL )
!     {
!       /* The LHS entity is qualified as "alpha", "beta", ...
         */
!       if( (rhs_quality = rhs.GetReleaseStatus()) == NULL )
!       {
! 	/* ...but the RHS entity is not; we always consider an
! 	 * unqualified version to implicitly represent "stable",
! 	 * which is always compared as "more recent" than any
! 	 * "alpha", "beta" or "rc" qualified release at the
! 	 * same package version point, so we may immediately
! 	 * confirm the LHS as the "lesser" release.
! 	 */
! 	DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
! 	    dmh_printf( "  mismatched: LHS is qualified; RHS is not, and is not a wildcard\n" )
! 	  );
! 	return -1;
!       }
  
!       /* If we still haven't differentiated them, then both LHS
!        * and RHS must be qualified.  Check if we can resolve the
!        * deadlock on the basis of progression of development from
!        * "alpha" through "beta" and "rc" to "stable" phases; (note
!        * that simply checking the initial character of the phase
!        * qualifier indicates the appropriate progression).
!        */
!       int chkval = *lhs_quality - *rhs_quality;
!       if( chkval != 0 ) return chkval;
  
!       /* If we still can't resolve the deadlock, then both LHS
!        * and LHS must be qualified as being in identically the
!        * same development phase, so we must now differentiate
!        * on the basis of progression of the release index...
!        */
!       lhs_version.Reset( GetReleaseIndex() );
!       rhs_version.Reset( rhs.GetReleaseIndex() );
!       /*
!        * ...noting that these progress in the same manner as
!        * the package version number itself.
!        */
!       if( lhs_version < rhs_version ) return -1;
!       if( lhs_version > rhs_version ) return +1;
!     }
  
!     else if( rhs.GetReleaseStatus() != NULL )
!     {
!       /*
!        * In this case, the RHS entity is qualified as "alpha",
!        * "beta", ..., but the LHS is not.  Since we've already
!        * determined that both represent the same version of the
!        * package, we may infer that the LHS represents a stable
!        * derivative of the qualified RHS, and thus corresponds
!        * to a more recent release, so return the appropriate
!        * value to indicate LHS > RHS.
!        */
!       DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
! 	  dmh_printf( "  mismatched: RHS qualified; LHS is not, and is not a wildcard\n" )
! 	);
!       return +1;
!     }
!   }
!   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
!       dmh_printf( "   package versions match; checking subsystem\n" )
!     );
  
    /* If we get to here, then LHS and RHS represent the same
***************
*** 242,245 ****
--- 297,303 ----
     * to assert their equality.
     */
+   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
+       dmh_printf( "   match found\n" )
+     );
    return 0;
  }

Index: pkgexec.cpp
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/pkgexec.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** pkgexec.cpp	13 Jun 2011 19:00:14 -0000	1.15
--- pkgexec.cpp	27 Jul 2011 20:36:00 -0000	1.16
***************
*** 277,280 ****
--- 277,283 ----
  pkgXmlNode *pkgActionItem::SelectIfMostRecentFit( pkgXmlNode *package )
  {
+   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
+       dmh_printf( "SelectIfMostRecentFit: begin function\n" )
+     );
    /* Assign "package" as the "selection" for the referring action item,
     * provided it matches the specified selection criteria and it represents
***************
*** 314,317 ****
--- 317,323 ----
    /* Whatever choice we make, we return the resultant selection...
     */
+   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
+       dmh_printf( "SelectIfMostRecentFit: end function\n" )
+     );
    return Selection();
  }

Index: pkgdeps.cpp
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/pkgdeps.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pkgdeps.cpp	13 Feb 2011 21:23:58 -0000	1.7
--- pkgdeps.cpp	27 Jul 2011 20:36:00 -0000	1.8
***************
*** 31,34 ****
--- 31,35 ----
  
  #include "dmh.h"
+ #include "debug.h"
  
  #include "pkginfo.h"
***************
*** 166,169 ****
--- 167,178 ----
  }
  
+ DEBUG_INVOKED static void
+ DEBUG_INVOKED show_required( pkgSpecs *req )
+ DEBUG_INVOKED {
+ DEBUG_INVOKED   const char *tarname = NULL;
+ DEBUG_INVOKED   dmh_printf( " require: %s\n", req->GetTarName( tarname ) );
+ DEBUG_INVOKED   free( (void *)(tarname) );
+ DEBUG_INVOKED }
+ 
  void
  pkgXmlDocument::ResolveDependencies( pkgXmlNode* package, pkgActionItem* rank )
***************
*** 176,179 ****
--- 185,191 ----
     * additional dependencies common to the containing package group.
     */
+   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
+       dmh_printf( "ResolveDependencies: begin function\n" )
+     );
    pkgSpecs *refdata = NULL;
    pkgXmlNode *refpkg = package;
***************
*** 203,207 ****
--- 215,224 ----
  	const char *refname;
  	if( (refname = refpkg->GetPropVal( tarname_key, NULL )) != NULL )
+ 	{
+ 	  DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
+ 	      dmh_printf( "%s: resolve dependencies\n", refname )
+ 	    );
  	  refdata = new pkgSpecs( refname );
+ 	}
        }
  
***************
*** 210,213 ****
--- 227,233 ----
        pkgActionItem wanted; pkgXmlNode *selected;
        pkgSpecs req( wanted.SetRequirements( dep, refdata ) );
+       DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
+ 	  show_required( &req )
+ 	);
        /*
         * (Both the package name, and subsystem if specified, must match)...
***************
*** 248,252 ****
  	    */
  	    const char *tstclass;
! 	    pkgSpecs tst( required->GetPropVal( tarname_key, NULL ) );
  	    if( (tstclass = tst.GetComponentClass()) == NULL )
  	      tstclass = value_unknown;
--- 268,275 ----
  	    */
  	    const char *tstclass;
! 	    pkgSpecs tst( tstclass = required->GetPropVal( tarname_key, NULL ) );
! 	    DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
! 		dmh_printf( " considering: %s\n", tstclass )
! 	      );
  	    if( (tstclass = tst.GetComponentClass()) == NULL )
  	      tstclass = value_unknown;
***************
*** 350,353 ****
--- 373,379 ----
      package = (package == GetRoot()) ? NULL : package->GetParent();
    }
+   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
+       dmh_printf( "ResolveDependencies: end function\n" )
+     );
    delete refdata;
  }

Update of /cvsroot/mingw/mingw-dist
In directory vz-cvs-4.sog:/tmp/cvs-serv5734

Modified Files:
	ChangeLog 
Log Message:
Update mingw32-pthreads; coordinate publication with gcc.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/ChangeLog,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** ChangeLog	5 Jun 2011 21:43:25 -0000	1.82
--- ChangeLog	12 Jul 2011 01:34:19 -0000	1.83
***************
*** 1,2 ****
--- 1,12 ----
+ 2011-07-11  Charles Wilson  <mi...@cw...>
+ 
+ 	Update mingw32-pthreads; coordinate publication with gcc.
+ 	* mingw32/mingw32-pthreads-w32.xml: Restructure & rename.
+ 	Update to 2.9.0-pre snapshot from 20110507. New packages:
+ 	mingw32-libpthreadgc, mingw32-libpthreadgce, mingw32-libquserex,
+ 	and mingw32-libpthread-old (containing just libpthread-2.dll for
+ 	backwards compatibility).
+ 	* mingw32/issue.: Update accordingly.
+ 
  2011-06-05  Earnie Boyd  <ea...@us...>