[maemo-commits] [maemo-commits] r16529 - projects/haf/doc/mvo

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-10-29 21:01:26 +0200 (Wed, 29 Oct 2008)
New Revision: 16529

Modified:
   projects/haf/doc/mvo/system-model-2.txt
Log:
Use "maemo.org-free" instead of "extras".  Added harmattan-pending
distribution.


Modified: projects/haf/doc/mvo/system-model-2.txt
===================================================================
--- projects/haf/doc/mvo/system-model-2.txt	2008-10-29 11:42:36 UTC (rev 16528)
+++ projects/haf/doc/mvo/system-model-2.txt	2008-10-29 19:01:26 UTC (rev 16529)
@@ -40,6 +40,10 @@
     Maemo community.  Nokia gets some special treatment as the 'owner'
     of the Maemo project, but not much.
 
+  - Ultimately, all our packages are published, with or without
+    source, with or without explicit license agreements.  Things that
+    are never to be published are not part of the Maemo system.
+
   - Sources are stored and worked on in many different ways, but they
     all come together in the form of Debian source packages that are
     stored in the Maemo archive.  These source packages are compiled
@@ -96,11 +100,17 @@
 to a anonymous license agreement).  This is different from releasing a
 version of Maemo.  See "Distributions", below.
 
-The categories are: nokia-free, nokia-freely-distributable,
-nokia-restricted, nokia-free-pending,
-nokia-freely-distributable-pending, nokia-restricted-pending,
-nokia-secret, extras.
+The categories are:
 
+ nokia-free
+ nokia-freely-distributable
+ nokia-restricted
+ nokia-free-pending
+ nokia-freely-distributable-pending
+ nokia-restricted-pending
+ maemo.org-free
+ maemo.org-non-free
+
 In detail:
 
  - nokia-free
@@ -154,22 +164,22 @@
  nokia-restricted that have not been published yet, similar to
  nokia-free-pending.
 
- - nokia-secret
+ - maemo.org-free
 
- Packages in nokia-secret can only be accessed by Nokia and only Nokia
- can upload to it.
+ Packages in maemo.org-free are Free Software.  They are licensed with a
+ OSI approved Open Source license.  Everybody can access this category
+ freely.  Only people with a garage.maemo.org account can upload to
+ it.
 
- - extras
+ - maemo.org-non-free
 
- Packages in extras are freely distributable.  Everybody can access
- them.  Only people with a garage.maemo.org account can upload to it.
+ Packages in maemo.org-non-free are not Free Software, but they can be
+ redistributed freely.  Some have source, others don't.  Everybody can
+ access this category freely.  Only people with a garage.maemo.org
+ account can upload to it.
 
- [ We could think about offering "extras-free", "extras-non-free",
-   etc.  This could be decided by the Maemo Community itself.
- ]
-
 The public categories starting with "nokia" are published on
-nokia.com.  The "extras" categories are published on maemo.org.
+nokia.com.  The "maemo.org" categories are published on maemo.org.
 
 
 ** Distributions
@@ -186,14 +196,15 @@
 copied together with all their binary packages.
 
 The distributions for Harmattan are "harmattan", "harmattan-testing",
-and "harmattan-proposed-updates".
+ "harmattan-proposed-updates", and "harmattan-pending".
 
 In detail:
 
  - harmattan
 
  This distribution contains the current release of harmattan.  Devices
- of normal users use this distribution.
+ of normal users use this distribution.  The *-pending categories of
+ this distribution must always be empty.
 
  - harmattan-testing
 
@@ -202,6 +213,8 @@
  source packages.  Developers use this distribution in the SDK.  Beta
  testers use this distribution on their devices.
 
+ The *-pending categories of this distribution must always be empty.
+
  - harmattan-proposed-updates
 
  This distribution is used to prepare small updates to packages in the
@@ -212,6 +225,20 @@
  security fixes.  It should be empty except for very short periods of
  time.
 
+ The *-pending categories of this distribution must always be empty.
+
+ - harmattan-pending
+
+ This distribution is used to handle packages in the *-pending
+ categories.  Source packages uploaded to (or redirected to) one of
+ the *-pending categories are compiled in harmattan-testing +
+ harmattan-pending.
+
+ The harmattan-pending distribution should actively be kept small (by
+ moving packages out of the *-pending categories) because it has a
+ natural tendency to grow: once a package is in *-pending, it attracts
+ more packages that depend on it.
+
 *** Compatibility
 
 Interface management will make the harmattan-testing distribution