myconfig

commit c6f0341c5133c4b5b5ab9c49269320d375e04310
parent 8e84fdb6a32301d80987e562fe4b7fb8b3309c5a
Author: Antoine Amarilli <a3nm@a3nm.net>
Date:   Sun,  4 Jan 2015 01:57:33 +0100

Merge branch 'master' of gitorious.org:myconfig/myconfig

Conflicts:
	apt/laptop_desktop

Diffstat:
apt/audio
 | 
1
+
apt/bitcoin
 | 
1
+
apt/cd
 | 
1
+
apt/desktop
 | 
3
++-
apt/devel
 | 
1
+
apt/dict
 | 
1
+
apt/external
 | 
1
+
apt/fasd
 | 
2
++
apt/games
 | 
1
+
apt/google-talkplugin
 | 
1
+
apt/laptop
 | 
1
+
apt/laptop_desktop
 | 
2
++
apt/laptop_recent
 | 
1
+
apt/laptop_x
 | 
1
-
apt/latex
 | 
1
+
apt/libs
 | 
1
+
apt/minimal
 | 
1
+
apt/misc
 | 
1
+
apt/nonfree
 | 
1
+
apt/notmuch
 | 
1
+
apt/notmuch-mutt
 | 
1
+
apt/pdfopt
 | 
1
+
apt/plover
 | 
1
+
apt/python
 | 
2
++
apt/retroshare
 | 
1
+
apt/s3ql
 | 
1
+
apt/server
 | 
1
+
apt/server_recent
 | 
4
++--
apt/skype
 | 
1
+
apt/toadd
 | 
4
++--
apt/tts
 | 
1
+
apt/util
 | 
1
+
apt/wesnoth
 | 
1
+
apt/wine
 | 
1
+

34 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/apt/audio b/apt/audio
@@ -1,3 +1,4 @@
+# useful tools to process audio
 lame
 timidity
 freepats
diff --git a/apt/bitcoin b/apt/bitcoin
@@ -1,3 +1,4 @@
+# dependencies for bitcoin compilation
 libboost-dev
 libboost-filesystem-dev
 libboost-program-options-dev
diff --git a/apt/cd b/apt/cd
@@ -1,2 +1,3 @@
+# tools for cd drives
 eject
 abcde
diff --git a/apt/desktop b/apt/desktop
@@ -1,3 +1,4 @@
+# graphical applications
 audacity
 cheese
 chromium
@@ -79,7 +80,7 @@ dirdiff
 gconf-editor
 poedit
 wmctrl
-parcimonie # should be headless...
+parcimonie # should be headless... http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=774529
 mesa-utils
 file-roller
 vgrabbj
diff --git a/apt/devel b/apt/devel
@@ -1,3 +1,4 @@
+# development tools
 javacc
 valgrind
 ltrace
diff --git a/apt/dict b/apt/dict
@@ -1,3 +1,4 @@
+# dictionaries
 wamerican-insane
 wdiff
 wfrench
diff --git a/apt/external b/apt/external
@@ -1,2 +1,3 @@
+# packages that must be installed separately
 dropbox
 skype:i386
diff --git a/apt/fasd b/apt/fasd
@@ -1 +1,3 @@
+# https://github.com/clvv/fasd
+# installed with checkinstall
 fasd
diff --git a/apt/games b/apt/games
@@ -1,3 +1,4 @@
+# games
 a7xpg
 armagetronad
 barrage
diff --git a/apt/google-talkplugin b/apt/google-talkplugin
@@ -1 +1,2 @@
+# google hangouts plugin (proprietary)
 google-talkplugin
diff --git a/apt/laptop b/apt/laptop
@@ -1,3 +1,4 @@
+# useful tools for laptop hardware
 cpufrequtils
 laptop-mode-tools
 rfkill
diff --git a/apt/laptop_desktop b/apt/laptop_desktop
@@ -1,3 +1,4 @@
+# tools for laptops which are useless for servers
 xsane
 xbacklight
 iodine
@@ -9,3 +10,4 @@ cups-client
 cups-filters
 network-manager
 network-manager-gnome
+system-config-printer
diff --git a/apt/laptop_recent b/apt/laptop_recent
@@ -1 +1,2 @@
+# laptop tools not in Debian stable
 aircrack-ng
diff --git a/apt/laptop_x b/apt/laptop_x
@@ -1 +0,0 @@
-system-config-printer
diff --git a/apt/latex b/apt/latex
@@ -1,3 +1,4 @@
+# latex and other typesetting tools
 texlive
 texlive-fonts-extra
 texlive-humanities
diff --git a/apt/libs b/apt/libs
@@ -1,3 +1,4 @@
+# useful libraries for compilation and scripts
 libncursesw5-dev
 libxml2-dev
 libmidi-perl # for mid2csound.pl
diff --git a/apt/minimal b/apt/minimal
@@ -1,3 +1,4 @@
+# crucial utilities and programs
 zsh
 git
 rsync
diff --git a/apt/misc b/apt/misc
@@ -1,3 +1,4 @@
+# various tools
 ack-grep
 autossh
 binutils
diff --git a/apt/nonfree b/apt/nonfree
@@ -1,3 +1,4 @@
+# from the Debian non-free repository
 unrar
 gcc-doc
 tar-doc
diff --git a/apt/notmuch b/apt/notmuch
@@ -1,3 +1,4 @@
+# packages required to compile notmuch
 libxapian-dev 
 libgmime-2.6-dev 
 libtalloc-dev
diff --git a/apt/notmuch-mutt b/apt/notmuch-mutt
@@ -1,3 +1,4 @@
+# packages required for notmuch-mutt
 libterm-readline-gnu-perl
 libstring-shellquote-perl
 libmail-box-perl
diff --git a/apt/pdfopt b/apt/pdfopt
@@ -1 +1,2 @@
+# packages required for pdfopt
 sam2p
diff --git a/apt/plover b/apt/plover
@@ -1,3 +1,4 @@
+# packages required for plover
 python-xlib
 python-serial
 python-wxgtk2.8
diff --git a/apt/python b/apt/python
@@ -1,3 +1,5 @@
+# packages for python development
+
 python3
 
 libpython2.7-stdlib
diff --git a/apt/retroshare b/apt/retroshare
@@ -1,3 +1,4 @@
+# packages to compile retroshare
 g++
 libgnome-keyring-dev
 libqt4-dev
diff --git a/apt/s3ql b/apt/s3ql
@@ -1,3 +1,4 @@
+# packages to compile s3ql
 libsqlite3-dev
 python-llfuse
 python-pycryptopp
diff --git a/apt/server b/apt/server
@@ -1,3 +1,4 @@
+# useful CLI tools
 powertop
 acpi
 acpid
diff --git a/apt/server_recent b/apt/server_recent
@@ -1,8 +1,8 @@
-# packages which are not in debian stable
+# useful CLI tools which are not in Debian stable
 bitcoind
 youtube-dl
 pass
 hopenpgp-tools
-tcplay
+tcplay # truecrypt alternative
 gsfonts-other
 easy-rsa
diff --git a/apt/skype b/apt/skype
@@ -1,3 +1,4 @@
+# dependencies of Skype
 libasound2:i386
 libxv1:i386
 libxss1:i386
diff --git a/apt/toadd b/apt/toadd
@@ -1,2 +1,2 @@
-parallel
-python-xkit
+# would be useful to have, but cannot be installed...
+parallel # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597050
diff --git a/apt/tts b/apt/tts
@@ -1,3 +1,4 @@
+# text-to-speech tools
 espeak
 festival
 festvox-italp16k
diff --git a/apt/util b/apt/util
@@ -1,3 +1,4 @@
+# various non-crucial CLI utilities
 abcmidi
 emacs
 archmage
diff --git a/apt/wesnoth b/apt/wesnoth
@@ -1,3 +1,4 @@
+# dependencies to compile Wesnoth
 wesnoth
 libsdl-ttf2.0-dev
 libsdl-net1.2-dev
diff --git a/apt/wine b/apt/wine
@@ -1,3 +1,4 @@
+# wine and useful related packages
 playonlinux
 wine
 wine64