From 1b92b4c5893f12baadb968599fe20c6466307e44 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 23 Jul 2011 12:19:54 +0200 Subject: [PATCH] add _docs/repositories, update hint on /downloads --- _docs/Makefile | 5 +- _docs/repositories | 58 +++++++++++++++++++ docs/repositories.html | 118 ++++++++++++++++++++++++++++++++++++++ downloads/index.html.mako | 31 ++++------ 4 files changed, 191 insertions(+), 21 deletions(-) create mode 100644 _docs/repositories create mode 100644 docs/repositories.html diff --git a/_docs/Makefile b/_docs/Makefile index bc5b4bd..b94e0eb 100644 --- a/_docs/Makefile +++ b/_docs/Makefile @@ -1,5 +1,5 @@ -all: hacking-howto.html debugging.html userguide.html ipc.html multi-monitor.html wsbar.html tree-migrating.html i3status.html i3.html +all: hacking-howto.html debugging.html repositories.html userguide.html ipc.html multi-monitor.html wsbar.html tree-migrating.html i3status.html i3.html hacking-howto.html: hacking-howto asciidoc -a linkcss -a stylesdir=/css -a scriptsdir=/js --backend=xhtml11 -f conf/i3html.conf -a toc -n $< @@ -7,6 +7,9 @@ hacking-howto.html: hacking-howto debugging.html: debugging asciidoc -a linkcss -a stylesdir=/css -a scriptsdir=/js --backend=xhtml11 -f conf/i3html.conf -n $< +repositories.html: repositories + asciidoc -a linkcss -a stylesdir=/css -a scriptsdir=/js --backend=xhtml11 -f conf/i3html.conf -n $< + userguide.html: userguide asciidoc -a linkcss -a stylesdir=/css -a scriptsdir=/js --backend=xhtml11 -f conf/i3html.conf -a toc -n $< diff --git a/_docs/repositories b/_docs/repositories new file mode 100644 index 0000000..1fd2694 --- /dev/null +++ b/_docs/repositories @@ -0,0 +1,58 @@ +Debian and Ubuntu repositories +============================== +Michael Stapelberg +July 2011 + +== When should you use our repositories? + +In general, you should use the repositories of your distribution. Adding +third-party repositories to your +/etc/sources.list+ has security implications +and makes your +apt-get update+ take longer. However, in some cases, using our +repositories makes sense: + +You are using Debian stable:: + The latest version of i3 will be in Debian testing quite soon. The version + in Debian stable can be old, however (we cannot update it after stable has + been released). The best way is to add Debian testing and tell +apt+ to + prefer Debian stable. You should *not* use our repository. +You are using Ubuntu:: + Only a handful of packages are maintained by Ubuntu developers. The rest is + synchronized periodically from Debian, every 6 months. Therefore, Ubuntu + often includes old versions of i3. You should use our Ubuntu repository. +You want the latest i3 development version:: + If you are using Debian (Debian-derived systems might work, too) and want + the latest development version of i3, you should use our Debian repository. + +== Ubuntu repository + +The Ubuntu repository is provided by sur5r and contains the latest stable release +of i3. To use it, run the following commands: + +--------------------------------------------------------------------------------- +# echo 'deb http://debian.sur5r.net/i3/ karmic universe' >> /etc/apt/sources.list +# apt-get update +# apt-get install i3 +--------------------------------------------------------------------------------- + +== Debian repository + +Our Debian repository contains packages which are automatically built a few +minutes after every commit. To use it, run the following commands: + +--------------------------------------------------------------------------------- +# echo 'deb http://build.i3wm.org/debian/i3-wm sid main' >> /etc/apt/sources.list +# apt-get update +# apt-get install i3-wm +--------------------------------------------------------------------------------- + +To ensure that the autobuilt i3 packages will be preferred to the packages of +your distribution, put the following entry *at the beginning* of your ++/etc/apt/preferences+: + +---------------------------- +Package: * +Pin: origin "build.i3wm.org" +Pin-Priority: 1001 +---------------------------- + +Then, install +i3-wm+. diff --git a/docs/repositories.html b/docs/repositories.html new file mode 100644 index 0000000..f11e536 --- /dev/null +++ b/docs/repositories.html @@ -0,0 +1,118 @@ + + + + + +i3: Debian and Ubuntu repositories + + + + + + + +
+

i3 - improved tiling WM

 + +
+
+ +
+

1. When should you use our repositories?

+
+

In general, you should use the repositories of your distribution. Adding +third-party repositories to your /etc/sources.list has security implications +and makes your apt-get update take longer. However, in some cases, using our +repositories makes sense:

+
+
+You are using Debian stable +
+
+

+ The latest version of i3 will be in Debian testing quite soon. The version + in Debian stable can be old, however (we cannot update it after stable has + been released). The best way is to add Debian testing and tell apt to + prefer Debian stable. You should not use our repository. +

+
+
+You are using Ubuntu +
+
+

+ Only a handful of packages are maintained by Ubuntu developers. The rest is + synchronized periodically from Debian, every 6 months. Therefore, Ubuntu + often includes old versions of i3. You should use our Ubuntu repository. +

+
+
+You want the latest i3 development version +
+
+

+ If you are using Debian (Debian-derived systems might work, too) and want + the latest development version of i3, you should use our Debian repository. +

+
+
+
+
+
+

2. Ubuntu repository

+
+

The Ubuntu repository is provided by sur5r and contains the latest stable release +of i3. To use it, run the following commands:

+
+
+
# echo 'deb http://debian.sur5r.net/i3/ karmic universe' >> /etc/apt/sources.list
+# apt-get update
+# apt-get install i3
+
+
+
+
+

3. Debian repository

+
+

Our Debian repository contains packages which are automatically built a few +minutes after every commit. To use it, run the following commands:

+
+
+
# echo 'deb http://build.i3wm.org/debian/i3-wm sid main' >> /etc/apt/sources.list
+# apt-get update
+# apt-get install i3-wm
+
+

To ensure that the autobuilt i3 packages will be preferred to the packages of +your distribution, put the following entry at the beginning of your +/etc/apt/preferences:

+
+
+
Package: *
+Pin: origin "build.i3wm.org"
+Pin-Priority: 1001
+
+

Then, install i3-wm.

+
+
+
+
+ + + diff --git a/downloads/index.html.mako b/downloads/index.html.mako index 4741fc5..af1d85c 100644 --- a/downloads/index.html.mako +++ b/downloads/index.html.mako @@ -69,23 +69,8 @@ currently distributed in the following operating systems/distributions: % endfor
- -

-Because Ubuntu syncs its packages only every 6 months with Debian, we provide a more recent repository. +We also provide Debian and Ubuntu repositories with up-to-date packages.

Downloads

@@ -173,18 +158,24 @@ Because Ubuntu syncs its packages only every 6 months with Debian, we provide a

Development version

- Use git to follow the latest changes: + Use git to follow the latest changes. This command checks out the 'master' branch: 

-  $ git clone git://code.stapelberg.de/i3
+  $ git clone git://code.i3wm.org/i3
+

+ The 'master' branch is the current stable version plus bugfixes.
+ The 'next' branch is the next version, yet to be released. Use git + checkout next to switch to the 'next' branch. +

+

If you prefer to download a tarball, or if you cannot use git for whatever reason, you may download the current master branch from - - http://code.stapelberg.de/git/i3/snapshot/i3-master.tar.bz2 + + http://code.i3wm.org/i3/snapshot/i3-master.tar.bz2

-- 2.39.5