Overlay:Flora - Revision history

92.192.14.62: /* Flora Main Ruleset */ comments.gmane.org/gmane.linux.gentoo.funtoo.devel/5028

2013-04-13T16:08:05Z

‎Flora Main Ruleset: comments.gmane.org/gmane.linux.gentoo.funtoo.devel/5028

Mmatk: /* merging in Upstream User Contributions */

2013-03-22T18:43:20Z

‎merging in Upstream User Contributions

178.209.62.149: /* merging in Upstream User Contributions */

2013-03-22T14:32:48Z

‎merging in Upstream User Contributions

Golodhrim: /* Submitting your release */

2012-12-30T17:26:58Z

‎Submitting your release

Janzhou: git merge master/develop -> git merge master develop

2012-12-23T16:34:16Z

git merge master/develop -> git merge master develop

Golodhrim: updated note for Userpage integration on ebuilds ppl add to Flora

2012-12-02T23:03:01Z

updated note for Userpage integration on ebuilds ppl add to Flora

Drobbins: Drobbins moved page Flora to Overlay:Flora: moving to new overlay namespace

2012-11-11T22:51:11Z

Drobbins moved page Flora to Overlay:Flora: moving to new overlay namespace

P4: /* merging in Upstream User Contributions */

2012-09-07T09:39:37Z

‎merging in Upstream User Contributions

Golodhrim: /* merging in Upstream User Contributions */

2012-06-09T14:05:39Z

‎merging in Upstream User Contributions

Golodhrim: /* merging in Upstream User Contributions */

2012-05-29T10:06:51Z

‎merging in Upstream User Contributions

@@ Line 208: / Line 208: @@
 * If you write your ebuild please make sure you add the following to your header:
    <pre>
      # Distributed under the terms of the GNU General Public License v2
     </pre>

@@ Line 38: / Line 38: @@
 * Merge the branches into flora<pre>git merge username/master</pre>
-* Push to ninja2<pre>git push</pre>
+* Push to username's git<pre>git push</pre>
 * Close the pull request on github, and no worry it will show you problems if you view the code again, as we already included the patch of the user :)

@@ Line 32: / Line 32: @@
 The workflow is splitted into some easy steps just follow the next instructions:
-* Add the forks to our flora clone:<br>The general syntax to add a remote clone for flora is:<pre>git remote add <username> git://github.com/<username>/flora.git</pre>so far the following forks are known and can be added if you copy the context:<pre>git remote add timoahummel git://github.com/timoahummel/flora.git&#10;git remote add leprosys git://github.com/leprosys/flora.git&#10;git remote add init6 git://github.com/init6/flora.git&#10;git remote add tarsius git://github.com/tarsius/flora.git&#10;git remote add tobert git://github.com/tobert/flora.git&#10;git remote add stasikos git://github.com/stasikos/flora.git&#10;git remote add trq git://github.com/trq/flora.git&#10;git remote add keenblade git://github.com/keenblade/flora.git&#10;git remote add edwtjo git://github.com/edwtjo/flora.git&#10;git remote add strowi git://github.com/strowi/flora.git&#10;git remote add ipalaus git://github.com/ipalaus/flora.git&#10;git remote add N4th4 git://github.com/N4th4/flora.git&#10;git remote add jmarcet git://github.com/jmarcet/flora.git&#10;git remote add drzayer git://github.com/drzayer/flora.git&#10;git remote add cvantassle git://github.com/cvantassle/flora.git&#10;git remote add wishstudio git://github.com/wishstudio/flora.git&#10;git remote add Saint0fCloud git://github.com/Saint0fCloud/flora.git&#10;git remote add The-Judge git://github.com/The-Judge/flora.git&#10;git remote add kpacheco git://github.com/kpacheco/flora.git&#10;git remote add modethirteen git://github.com/modethirteen/flora.git&#10;git remote add sandikata git://github.com/sandikata/flora.git&#10;git remote add synchris git://github.com/synchris/flora.git&#10;git remote add vadmeste git://github.com/vadmeste/flora.git&#10;git remote add rh1 git://github.com/rh1/flora.git&#10;git remote add just1602 git://github.com/just1602/flora.git&#10;git remote add mozgwar git://github.com/mozgwar/flora.git&#10;git remote add rem7 git://github.com/rem7/flora.git&#10;git remote add akiress git://github.com/akiress/flora.git&#10;git remote add ereslibre git://github.com/ereslibre/flora.git&#10;git remote add dangergrrl git://github.com/dangergrrl/flora.git&#10;git remote add crazyfraggle git://github.com/crazyfraggle/flora.git&#10;git remote add nakaran git://github.com/nakaran/flora.git&#10;git remote add PaddyMac git://github.com/PaddyMac/flora.git&#10;git remote add deferi git://github.com/deferi/flora.git&#10;git remote add ozon git://github.com/ozon/flora.git&#10;git remote add mma git://github.com/mma/flora.git&#10;git remote add alexjp git://github.com/alexjp/flora.git&#10;git remote add funkycode git://github.com/funkycode/flora.git&#10;git remote add limansky git://github.com/limansky/flora.git&#10;git remote add fearedbliss git://github.com/fearedbliss/flora.git&#10;git remote add lebel git://github.com/lebel/flora.git&#10;git remote add SaThero git://github.com/SaThero/flora.git&#10;git remote add soulthreads git://github.com/soulthreads/flora.git</pre>
+* Add the forks to our flora clone:<br>The general syntax to add a remote clone for flora is:<pre>git remote add <username> git://github.com/<username>/flora.git</pre>so far the following forks are known and can be added if you copy the context:<pre>git remote add timoahummel git://github.com/timoahummel/flora.git&#10;git remote add leprosys git://github.com/leprosys/flora.git&#10;git remote add init6 git://github.com/init6/flora.git&#10;git remote add tarsius git://github.com/tarsius/flora.git&#10;git remote add tobert git://github.com/tobert/flora.git&#10;git remote add stasikos git://github.com/stasikos/flora.git&#10;git remote add trq git://github.com/trq/flora.git&#10;git remote add keenblade git://github.com/keenblade/flora.git&#10;git remote add edwtjo git://github.com/edwtjo/flora.git&#10;git remote add strowi git://github.com/strowi/flora.git&#10;git remote add ipalaus git://github.com/ipalaus/flora.git&#10;git remote add N4th4 git://github.com/N4th4/flora.git&#10;git remote add jmarcet git://github.com/jmarcet/flora.git&#10;git remote add drzayer git://github.com/drzayer/flora.git&#10;git remote add cvantassle git://github.com/cvantassle/flora.git&#10;git remote add wishstudio git://github.com/wishstudio/flora.git&#10;git remote add Saint0fCloud git://github.com/Saint0fCloud/flora.git&#10;git remote add The-Judge git://github.com/The-Judge/flora.git&#10;git remote add kpacheco git://github.com/kpacheco/flora.git&#10;git remote add modethirteen git://github.com/modethirteen/flora.git&#10;git remote add sandikata git://github.com/sandikata/flora.git&#10;git remote add synchris git://github.com/synchris/flora.git&#10;git remote add vadmeste git://github.com/vadmeste/flora.git&#10;git remote add rh1 git://github.com/rh1/flora.git&#10;git remote add just1602 git://github.com/just1602/flora.git&#10;git remote add mozgwar git://github.com/mozgwar/flora.git&#10;git remote add rem7 git://github.com/rem7/flora.git&#10;git remote add akiress git://github.com/akiress/flora.git&#10;git remote add ereslibre git://github.com/ereslibre/flora.git&#10;git remote add dangergrrl git://github.com/dangergrrl/flora.git&#10;git remote add crazyfraggle git://github.com/crazyfraggle/flora.git&#10;git remote add nakaran git://github.com/nakaran/flora.git&#10;git remote add PaddyMac git://github.com/PaddyMac/flora.git&#10;git remote add deferi git://github.com/deferi/flora.git&#10;git remote add ozon git://github.com/ozon/flora.git&#10;git remote add mmtk git://github.com/mmtk/flora.git&#10;git remote add alexjp git://github.com/alexjp/flora.git&#10;git remote add funkycode git://github.com/funkycode/flora.git&#10;git remote add limansky git://github.com/limansky/flora.git&#10;git remote add fearedbliss git://github.com/fearedbliss/flora.git&#10;git remote add lebel git://github.com/lebel/flora.git&#10;git remote add SaThero git://github.com/SaThero/flora.git&#10;git remote add soulthreads git://github.com/soulthreads/flora.git</pre>
 * Pull the changed/added files into your copy of flora, where username is the repo of the user that wants to add stuff to flora<pre>git fetch username</pre>

@@ Line 460: / Line 460: @@
 [master 8f9414a] committextsubject line<br>
 &nbsp;&nbsp; 1 files changed, 1 insertions(+), 0 deletions(-)
-&nbsp;&nbsp; create mode 100644 test-file
+&nbsp;&nbsp; create mode 100644 test-file <br>
-$ git push<br>golodhrim@lorien [±:master] flora % git push
+$ git push<br>
-Counting objects: 4, done.
+Counting objects: 4, done.<br>
-Delta compression using up to 2 threads.
+Delta compression using up to 2 threads.<br>
-Compressing objects: 100% (2/2), done.
+Compressing objects: 100% (2/2), done.<br>
-Writing objects: 100% (3/3), 342 bytes, done.
+Writing objects: 100% (3/3), 342 bytes, done.<br>
-Total 3 (delta 1), reused 0 (delta 0)
+Total 3 (delta 1), reused 0 (delta 0)<br>
-To git@github.com:golodhrim/flora.git
+To git@github.com:golodhrim/flora.git<br>
 &nbsp;&nbsp;&nbsp;&nbsp;7361f3f..8f9414a  master -> master
 }}

@@ Line 318: / Line 318: @@
 &nbsp; create mode 100644 www-servers/jetty/Manifest<br>
 &nbsp; create mode 100644 www-servers/jetty/jetty-6.1.24.ebuild<br>
-$ git merge master/develop
+$ git merge master develop
 }}
@@ Line 328: / Line 328: @@
 git fetch upstream
 git merge upstream/master
-git merge master/develop
+git merge master develop
 </pre>

← Older revision		Revision as of 23:03, 2 December 2012
Line 552:		Line 552:
	If you follow these few rules we are positive that we will get on in a good manner here and live next to each other in peace.		If you follow these few rules we are positive that we will get on in a good manner here and live next to each other in peace.

		+
		+	== Special note for Flora contributors ==
		+
		+	All contributors to Flora, please edit your userpage.
		+
		+	* Create an account on our [http://www.funtoo.org/index.php?title=Special:UserLogin page here] if you do not have already, else login and
		+	* go to your Userpage and edit/create it with the Form (Create with Form/Edit with Form Button at the top right) :)
		+	* add all your ebuilds you added to Flora with that form in the format "sys-foo/bar"
		+	* save your userpage.
		+
		+	This will help us to see who was responsible for which ebuild and who we should contact if there is a build failure or problems with the ebuild. Thanks for your help. :)

	== Other Wiki Info for Flora ==		== Other Wiki Info for Flora ==