Give contributed package their own package list.

diff --git a/ChangeLog b/ChangeLog
index 7fb7d28..8f375ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-01-07  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Give contributed package their own package list.
+
+       * mingw32/mingw32-package-list.xml: Remove contributed packages, to...
+       * contrib/mingw32-contrib-package-list.xml: ...this new file.
+       * common/package-list.xml (mingw32-contrib-package-list.xml): Add it.
+       * common/issue.log mingw32/issue.log contrib/issue.log: Regenerate;
+       publish all affected catalogue files.
+
 2016-01-04  Erwin Waterlander  <waterlan@xs4all.nl>
 
        Upgrade mingw32-libunistring package to 0.9.6.

diff --git a/common/issue.log b/common/issue.log
index 8dc1d02..71f6835 100644 (file)
--- a/common/issue.log
+++ b/common/issue.log
@@ -23,6 +23,6 @@
 # MinGW Project, accept liability for any damages, however caused,
 # arising from the use of this software.
 #
-  75fc52dde8d408d798c0be51070d5d02f4c63085 2016010300 package-list.xml
+  c6a9068e183254c0b930ac6e1a70fd81743dc212 2016010701 package-list.xml
 #
 # $RCSfile$: end of file

diff --git a/common/package-list.xml b/common/package-list.xml
index 1b18fab..2bc40dd 100644 (file)
--- a/common/package-list.xml
+++ b/common/package-list.xml
@@ -5,6 +5,7 @@
   <!-- This is the master package catalogue for the MinGW Project -->
 
   <package-list catalogue="mingw32-package-list" />
+  <package-list catalogue="mingw32-contrib-package-list" />
   <package-list catalogue="msys-package-list" />
 
 </software-distribution>

diff --git a/contrib/issue.log b/contrib/issue.log
index 7995b7a..f1d491a 100644 (file)
--- a/contrib/issue.log
+++ b/contrib/issue.log
@@ -23,6 +23,7 @@
 # MinGW Project, accept liability for any damages, however caused,
 # arising from the use of this software.
 #
+  6ce16f1347a24682fd4abb1b06482d0a4d780a81 2016010700 mingw32-contrib-package-list.xml
   060b76884c7f336b75d32347c29545f3876ee3d5 2016010400 mingw32-libunistring.xml
   9ac41f7da60aabe9bf185f76a49382fedb59465d 2016010300 mingw32-ncurses.xml
   7f7474478d1ca1464d391beb0bd574a48a745315 2011101100 mingw32-pdcurses.xml

diff --git a/contrib/mingw32-contrib-package-list.xml b/contrib/mingw32-contrib-package-list.xml
new file mode 100644 (file)
index 0000000..df74827
--- /dev/null
+++ b/contrib/mingw32-contrib-package-list.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<software-distribution project="MinGW" home="http://www.mingw.org" issue="@YYYYMMDDNN@">
+
+  <!-- File: mingw32-contrib-package-list.xml -->
+
+  <package-group-hierarchy>
+    <package-group name="MinGW" expand="true">
+      <package-group name="MinGW Contributed">
+        <package-group name="MinGW Contributed Applications" />
+        <package-group name="MinGW Contributed Libraries" />
+      </package-group>
+    </package-group>
+  </package-group-hierarchy>
+
+  <!-- "real" packages ~~ user contributed -->
+  <package-list catalogue="mingw32-libunistring" />
+  <package-list catalogue="mingw32-ncurses" />
+  <package-list catalogue="mingw32-pdcurses" />
+  <package-list catalogue="mingw32-tcltk" />
+  <package-list catalogue="mingw32-xerces-c" />
+
+</software-distribution>
+<!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 shiftwidth=2: -->

diff --git a/mingw32/issue.log b/mingw32/issue.log
index fac1ed0..6d352aa 100644 (file)
--- a/mingw32/issue.log
+++ b/mingw32/issue.log
@@ -50,7 +50,7 @@
   cd33ad74b608bce33ea297801253e6efbafce27c 2012073100 mingw32-mingw-utils.xml
   8d3a7125499a85916b53efb4c897ac907e2490ab 2015082000 mingw32-mpc.xml
   8a11de23e7a89fd11436bdf162ef90712f30101b 2013102300 mingw32-mpfr.xml
-  d029e3988826aeaa875dae83484f2d30ccb94b76 2016010300 mingw32-package-list.xml
+  56f4032058328cacfabe64fa46706d72c2fa931e 2016010700 mingw32-package-list.xml
   1f15439ee5f66ec22321c7aa853559b6f8f7172f 2015090800 mingw32-pexports.xml
   cdb2a4dbedfc9f2cdfc92340f6f9b12da061c0d9 2012073100 mingw32-popt.xml
   0a5d210a13d073104fb74b4f9c081674c9745cd1 2013090900 mingw32-pthreads-w32.xml

diff --git a/mingw32/mingw32-package-list.xml b/mingw32/mingw32-package-list.xml
index 8c58ea3..c5cae92 100644 (file)
--- a/mingw32/mingw32-package-list.xml
+++ b/mingw32/mingw32-package-list.xml
@@ -56,13 +56,6 @@
   <package-list catalogue="mingw32-xz" />
   <package-list catalogue="mingw32-zlib" />
 
-  <!-- "real" packages ~~ user contributed -->
-  <package-list catalogue="mingw32-libunistring" />
-  <package-list catalogue="mingw32-ncurses" />
-  <package-list catalogue="mingw32-pdcurses" />
-  <package-list catalogue="mingw32-tcltk" />
-  <package-list catalogue="mingw32-xerces-c" />
-
   <!-- "virtual" packages -->
   <package-list catalogue="mingw32-base" />
   <package-list catalogue="mingw32-autotools" />