Fri Dec 23 23:14:44 UTC 2011

9 files changed, 293 insertions, 67 deletions

diff --git a/~lukeshu/android-udev/51-android.rules b/~lukeshu/android-udev/51-android.rules
index c52379309..51f80cf54 100644
--- a/~lukeshu/android-udev/51-android.rules
+++ b/~lukeshu/android-udev/51-android.rules
@@ -1,24 +1,23 @@
 #      Acer
 SUBSYSTEM=="usb", ATTR{idVendor}=="0502", MODE="0666", GROUP="adbusers"
-#      ICONIA TAB A500
+#      Iconia Tab A500
 SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3325", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3325", SYMLINK+="android_fastboot" 
+SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3325", SYMLINK+="android_fastboot"
+#      Liquid
+SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3202"
+SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3203", SYMLINK+="android_adb"
 
 #      Archos
 SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", MODE="0666", GROUP="adbusers"
 #      43
 SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1417", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1417", SYMLINK+="android_fastboot" 
+SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1417", SYMLINK+="android_fastboot"
 #      101
 SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="android_fastboot" 
+SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="android_fastboot"
 
 #      Asus
-SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0666", GROUP="adbusers" 
-
-#      Blade
-SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1354", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="d00d", SYMLINK+="android_fastboot"
+SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0666", GROUP="adbusers"
 
 #      Dell
 SUBSYSTEM=="usb", ATTR{idVendor}=="413c", MODE="0666", GROUP="adbusers"
@@ -32,13 +31,15 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="091e", MODE="0666", GROUP="adbusers"
 #      Google
 SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0666", GROUP="adbusers"
 #      NEXUS S
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e21", 
+SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e21",
 SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e22", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e20", SYMLINK+="android_fastboot" 
+SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e20", SYMLINK+="android_fastboot"
 #      Nexus One
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e11", 
+SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e11",
 SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e12", SYMLINK+="android_adb"
 SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
+#      Generic and unspecified debug interface
+SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="d00d", SYMLINK+="android_fastboot"
 
 #      HTC
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0666", GROUP="adbusers"
@@ -46,14 +47,17 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0666", GROUP="adbusers"
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0cb2", SYMLINK+="android_adb"
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0cb2", SYMLINK+="android_fastboot"
 #      Desire (Bravo)
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", 
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c87", SYMLINK+="android_adb"
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
+#      Desire HD
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ca2", SYMLINK+="android_adb"
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
 #      Desire Z
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_adb"
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_fastboot"
 #      Evo Shift
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", 
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ca5", SYMLINK+="android_adb"
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
 #      HD2
@@ -61,36 +65,37 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="and
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_fastboot"
 #      Hero H2000
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0001", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0001", SYMLINK+="android_fastboot" 
-#      Hero (GSM)
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", 
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0001", SYMLINK+="android_fastboot"
+#      Hero (GSM), Desire
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c99", SYMLINK+="android_adb"
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
 #      Hero (CDMA)
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", 
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c9a", SYMLINK+="android_adb"
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
 #      Incredible
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", 
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c9e", SYMLINK+="android_adb"
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Incredible rev 0002
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", 
+#      Evo 4G, Incredible rev 0002
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c8d", SYMLINK+="android_adb"
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
 #      MyTouch 4G
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", 
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c96", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" 
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
 #      Slide
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", 
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0e03", SYMLINK+="android_adb"
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Tatoo
+#      Tatoo, Dream, ADP1 , G1, Magic
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c01"
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_adb"
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_fastboot"
 #      Vision
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", 
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_adb"
 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
 #      Wildfire
@@ -122,8 +127,14 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="17ef", MODE="0666", GROUP="adbusers"
 
 #      LG
 SUBSYSTEM=="usb", ATTR{idVendor}=="1004", MODE="0666", GROUP="adbusers"
-#      LG (Swift) GT540
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="d00d", SYMLINK+="android_fastboot" 
+#      Ally, Vortex, P500
+SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="618f"
+SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="618e", SYMLINK+="android_adb"
+#      Optimus One
+SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="61c5", SYMLINK+="android_adb"
+#      Swift GT540
+SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="61b4", SYMLINK+="android_adb"
+
 
 #      Motorola
 SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0666", GROUP="adbusers"
@@ -131,14 +142,14 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0666", GROUP="adbusers"
 SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="2d66"
 #      Defy/MB525
 SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="428c"
-#      Droid 
+#      Droid
 SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="41db"
 #      -- Xoom ID 1
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8",SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8",SYMLINK+="android_fastboot"
+SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8", SYMLINK+="android_adb"
+SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8", SYMLINK+="android_fastboot"
 #      -- Xoom ID 2
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9",SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9",SYMLINK+="android_fastboot" 
+SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9", SYMLINK+="android_adb"
+SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9", SYMLINK+="android_fastboot"
 
 #      NEC
 SUBSYSTEM=="usb", ATTR{idVendor}=="0409", MODE="0666", GROUP="adbusers"
@@ -178,15 +189,16 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6601", SYMLINK+="and
 SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="68a9", SYMLINK+="libmtp-%k", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1"
 #      Galaxy i7500
 SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6640", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6640", SYMLINK+="android_fastboot" 
+SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6640", SYMLINK+="android_fastboot"
 #      Galaxy S
 SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6601", SYMLINK+="android_adb"
 SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685d", MODE="0666"
 SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="68c3", MODE="0666"
 #      Galaxy Tab
 SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6877", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6877", SYMLINK+="android_fastboot" 
-#      Galaxy Tab 10.1
+SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6877", SYMLINK+="android_fastboot"
+#      Galaxy Tab 10.1, i9100 S2
+SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6860"
 SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685e", SYMLINK+="android_adb"
 SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685e", SYMLINK+="android_fastboot"
 SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6860", SYMLINK+="libmtp-%k", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1"
@@ -196,6 +208,18 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="04dd", MODE="0666", GROUP="adbusers"
 
 #      Sony Ericsson
 SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", MODE="0666", GROUP="adbusers"
+#      Xperia X10 mini
+SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3137"
+SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2137", SYMLINK+="android_adb"
+#      Xperia X10 mini pro
+SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3138"
+SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2138", SYMLINK+="android_adb"
+#      Xperia X8
+SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3149"
+SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2149", SYMLINK+="android_adb"
+#      Xperia X12
+SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="e14f"
+SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="614f", SYMLINK+="android_adb"
 
 #      Toshiba
 SUBSYSTEM=="usb", ATTR{idVendor}=="0930", MODE="0666", GROUP="adbusers"
@@ -203,6 +227,6 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="0930", MODE="0666", GROUP="adbusers"
 #      ZTE
 SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", MODE="0666", GROUP="adbusers"
 #      Blade
-SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1353", 
+SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1353",
 SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1351", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1354", SYMLINK+="android_fastboot" 
+
diff --git a/~lukeshu/android-udev/Makefile b/~lukeshu/android-udev/Makefile
new file mode 100644
index 000000000..238877f5a
--- /dev/null
+++ b/~lukeshu/android-udev/Makefile
@@ -0,0 +1,33 @@
+# Use this to update the package from AUR.
+
+default: PHONY all
+all: PHONY 51-android.rules PKGBUILD 
+
+name=android-udev
+
+aur:
+	mkdir $@
+aur/%.tar.gz: | aur
+	cd aur && wget http://aur.archlinux.org/packages/$*/$*.tar.gz
+aur/%: aur/%.tar.gz
+	cd aur && tar xzf $(notdir $<)
+aur/$(name)/%: aur/$(name).tar.gz | aur/$(name)
+	test -f $@ && touch $@
+
+51-android.rules: aur/$(name)/51-android.rules
+	sed -r 's/\s+$$//' < $< > $@
+
+PKGBUILD: aur/$(name)/PKGBUILD 51-android.rules
+	# Update pkg{ver,rel}
+	ver=`grep -m1 pkgver= $<`  ; sed -i "s/pkgver=.*/$$ver/" $@
+	rel=`grep -m1 pkgrel= $<`.1; sed -i "s/pkgrel=.*/$$rel/" $@
+	# Update md5sums
+	sed -i '/md5sums/,$$d' $@
+	makepkg -g >> $@
+
+clean: PHONY
+	rm -rf aur
+maintainerclean: PHONY clean
+	rm -f 51-android.rules
+
+.PHONY: PHONY FORCE
diff --git a/~lukeshu/android-udev/PKGBUILD b/~lukeshu/android-udev/PKGBUILD
index dabb611c9..6900b46da 100644
--- a/~lukeshu/android-udev/PKGBUILD
+++ b/~lukeshu/android-udev/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: marlock
 
 pkgname=android-udev
-pkgver=0.7
-pkgrel=3.1
+pkgver=0.8
+pkgrel=1.1
 pkgdesc='Udev rules to for Android devices.'
 arch=('any')
 url="http://developer.android.com/guide/developing/device.html"
@@ -15,8 +15,8 @@ conflicts=('udev-android-rules')
 install='android-udev.install'
 
 package() {
-  install -d $pkgdir/etc/udev/rules.d
-  install -m644 $srcdir/51-android.rules $pkgdir/etc/udev/rules.d/51-android.rules
+  install -d "$pkgdir/etc/udev/rules.d"
+  install -m644 "$srcdir/51-android.rules" "$pkgdir/etc/udev/rules.d/51-android.rules"
 }
 
-md5sums=('bfcd8d0e4c5bdeed0973e102a656e1eb')
+md5sums=('909eb7629683efae838c6e9d65966b3b')
diff --git a/~lukeshu/emacs24/PKGBUILD b/~lukeshu/emacs24/PKGBUILD
new file mode 100644
index 000000000..00f90b16a
--- /dev/null
+++ b/~lukeshu/emacs24/PKGBUILD
@@ -0,0 +1,82 @@
+# $Id: PKGBUILD 137977 2011-09-13 15:26:07Z juergen $
+# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
+pkgname=emacs24-bzr
+_majorver=24.0.92
+pkgver=106675
+pkgrel=4
+pkgdesc="The extensible, customizable, self-documenting real-time display editor"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/emacs/emacs.html"
+license=('GPL3')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib')
+install=emacs.install
+source=(emacs.desktop)
+md5sums=()
+
+_bzrtrunk=bzr://bzr.savannah.gnu.org/emacs/trunk
+_bzrmod=$pkgname
+
+build() {
+  cd "$srcdir"
+  msg "Connecting to Bazaar server...."
+
+  if [[ -d "$_bzrmod" ]]; then
+    cd "$_bzrmod" && bzr --no-plugins pull "$_bzrtrunk" -r "$pkgver"
+    msg "The local files are updated."
+  else
+    bzr --no-plugins branch "$_bzrtrunk" "$_bzrmod" -q -r "$pkgver"
+  fi
+
+  msg "Bazaar checkout done or server timeout"
+  msg "Starting build..."
+
+  rm -rf "$srcdir/$_bzrmod-$_majorver"
+  cp -r "$srcdir/$_bzrmod" "$srcdir/$_bzrmod-$_majorver"
+
+  cd "$srcdir"/$pkgname-$_majorver
+  ./autogen.sh
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+    --localstatedir=/var --with-x-toolkit=gtk --with-xft
+  make
+}
+
+package() {
+  provides=("emacs=${_majorver}a")
+
+  cd "$srcdir"/$pkgname-$_majorver
+  make DESTDIR="$pkgdir" install
+
+  # remove conflict with ctags package
+  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
+  mv "$pkgdir"/usr/share/man/man1/{ctags,ctags.emacs}.1.gz
+  # fix all the 777 perms on directories
+  find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \;
+  # fix user/root permissions on usr/share files
+  find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \;
+  # fix perms on /var/games
+  chmod 775 "$pkgdir"/var/games
+  chmod 775 "$pkgdir"/var/games/emacs
+  chmod 664 "$pkgdir"/var/games/emacs/*
+  chown -R root:games "$pkgdir"/var/games
+
+  # fix  FS#9253
+  mkdir -p "$pkgdir"/usr/share/pixmaps
+  ln -s  $pkgdir../emacs/$_majorver/etc/images/icons/hicolor/48x48/apps/emacs.png "$pkgdir"/usr/share/pixmaps/emacs-icon.png
+
+  # This is done down here to help future-proof the above
+  rm "$pkgdir"/usr/bin/emacs
+  mv "$pkgdir"/usr/share/man/man1/emacs{,-$_majorver}.1.gz
+  for prog in ctags.emacs ebrowse emacsclient etags grep-changelog rcs-checkin; do
+    mv "$pkgdir"/usr/bin/$prog{,-$_majorver}
+    mv "$pkgdir"/usr/share/man/man1/$prog{,-24}.1.gz
+  done
+  mv "$pkgdir"/usr/share/applications/emacs{,24}.desktop
+  mv "$pkgdir"/usr/share/emacs/site-lisp/subdirs{,.emacs24}.el
+  rm "$pkgdir"/usr/share/info/dir
+  for file in "$pkgdir"/usr/share/pixmaps/emacs-icon.png `find "$pkgdir"/usr/share/{icons,info} -type f`; do
+    mv "$file" "`echo "$file"|sed 's/\..*/-24&/'`"
+  done
+  ln -s "$_majorver" "$pkgdir"/usr/share/emacs/24
+  rm "$pkgdir"/var/games/emacs/*
+}
diff --git a/~lukeshu/emacs24/emacs.install b/~lukeshu/emacs24/emacs.install
new file mode 100644
index 000000000..d84f1de14
--- /dev/null
+++ b/~lukeshu/emacs24/emacs.install
@@ -0,0 +1,32 @@
+ICON_PATH=usr/share/icons/hicolor
+INFO_DIR=usr/share/info
+
+INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
+ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
+forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
+org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
+speedbar tramp url vip viper widget woman)
+
+post_install() {
+  gtk-update-icon-cache -q -t -f ${ICON_PATH}
+  update-desktop-database -q
+
+  [[ -x usr/bin/install-info ]] || return 0
+  for f in ${INFO_FILES[@]}; do
+    install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gtk-update-icon-cache -q -t -f ${ICON_PATH}
+  update-desktop-database -q
+
+  [[ -x usr/bin/install-info ]] || return 0
+  for f in ${INFO_FILES[@]}; do
+    install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+  done
+}
diff --git a/~lukeshu/openni-unstable/PKGBUILD b/~lukeshu/openni-unstable/PKGBUILD
index 32020d726..19d1575a1 100644
--- a/~lukeshu/openni-unstable/PKGBUILD
+++ b/~lukeshu/openni-unstable/PKGBUILD
@@ -21,24 +21,23 @@ pkgname=(
     openni$_suf-java-samples
     openni$_suf-java-samples-source
     )
-pkgver=1.3.4.6
-pkgrel=4
+pkgver=1.4.0.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.openni.org/"
 license=('GPL')
 makedepends=('git' 'doxygen' 'graphviz')
+options+=('!strip')
 source=()
 md5sums=()
 
 __gitroot="git://github.com/OpenNI/OpenNI.git"
 _gitname="openni"
-#_gitbranch="unstable"
-#_gitbranch="master"
 _gitbranch="Unstable-$pkgver"
 
 _os='Linux'
 case "${CARCH}" in
-'x86_64') _arch=x86;;
+'x86_64') _arch=x64;;
 'i686')   _arch=x86;;
 'arm')    _arch=Arm;; # untested
 *)        _arch=UNSUPPORTED_ARCH;;
@@ -51,27 +50,32 @@ build() {
   cd "${srcdir}"
   msg "Connecting to GIT server...."
 
-  if [ -d ${_gitname} ] ; then
+  #if [ -d ${_gitname} ] ; then
     cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${__gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
+  #  git checkout master
+  #  git pull origin
+  #  msg "The local files are updated."
+  #else
+  #  git clone ${__gitroot} ${_gitname}
+  #  cd ${_gitname}
+  #fi
   git checkout ${_gitbranch}
   cd ..
 
   msg "GIT checkout done or server timeout"
-  msg "Starting make..."
+  msg "Starting build..."
 
-  rm -rf "${srcdir}/${_gitname}-build"
-  git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
+  #rm -rf "${srcdir}/${_gitname}-build"
+  #git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
   cd "${srcdir}/${_gitname}-build"
 
   # PATCH
   sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker"
+
+  for sample in NiViewer NiSimpleViewer NiUserTracker NiUserSelection NiHandTracker; do
+      echo 'USED_LIBS += GL' >> "Platform/${_os}/Build/Samples/${sample}/Makefile"
+  done
+
   echo '
 abs_core: $(ALL_MODULES) $(ALL_UTILS)
 abs_core_samples: $(CORE_SAMPLES)
@@ -87,7 +91,9 @@ abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
   make -j1 \
       abs_core abs_core_samples \
       abs_java abs_java_samples \
-      abs_mono abs_mono_samples || return 1
+      abs_mono abs_mono_samples
+  cd "../Bin/${_arch}-Release"
+  ln NiViewer Sample-NiViewer
 
   cd '../../../Source/DoxyGen'
   mkdir html
@@ -117,7 +123,7 @@ package_openni-unstable-docs() {
 package_openni-unstable-core() {
   pkgdesc="OpenNI core libraries"
   depends=('libusb' 'freeglut')
-  install="openni.install"
+  install="openni-core.install"
   provides=('openni-core')
   conflicts=('openni-core')
 
@@ -144,6 +150,8 @@ package_openni-unstable-core() {
   cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build"
   install -d "${pkgdir}/usr/share"
   cp -r Common "${pkgdir}/usr/share/common"
+
+  install -d "${pkgdir}/var/lib/ni"
 }
 
 package_openni-unstable-java() {
@@ -164,6 +172,7 @@ package_openni-unstable-java() {
 package_openni-unstable-mono() {
   pkgdesc="OpenNI mono wrapper"
   depends=("openni$_suf" 'mono')
+  install="openni-mono.install"
   provides=('openni-mono')
   conflicts=('openni-mono')
 
@@ -183,14 +192,16 @@ _install_sample_source() {
   install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
 }
 
-# Leave out NiViewer, it's set up wrong
 CORE_SAMPLES='
   AudioSample
   BackRecorder
   CRead
   ConvertXToONI
+  HandTracker
   RecordSynthetic
   SimpleCreate
+  UserSelection
+  Viewer
               SimpleRead SimpleViewer UserTracker'
 MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
 JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
@@ -204,9 +215,8 @@ package_openni-unstable-core-samples() {
 
   cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
   install -d "${pkgdir}/usr/bin"
-  install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer"
   for sample in $CORE_SAMPLES; do
-    install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
+    install -m755 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
   done
 }
 package_openni-unstable-core-samples-source() {
@@ -214,7 +224,6 @@ package_openni-unstable-core-samples-source() {
   depends=("openni$_suf-core")
   provides=('openni-core-samples-source')
   conflicts=('openni-core-samples-source')
-  options+=('!strip')
 
   cd "${srcdir}/${_gitname}-build"
   for sample in Viewer $CORE_SAMPLES; do
@@ -246,7 +255,6 @@ package_openni-unstable-java-samples-source() {
   depends=("openni$_suf-java")
   provides=('openni-java-samples-source')
   conflicts=('openni-java-samples-source')
-  options+=('!strip')
 
   cd "${srcdir}/${_gitname}-build"
   for sample in $JAVA_SAMPLES; do
@@ -278,7 +286,6 @@ package_openni-unstable-mono-samples-source() {
   depends=("openni$_suf-mono")
   provides=('openni-mono-samples-source')
   conflicts=('openni-mono-samples-source')
-  options+=('!strip')
 
   cd "${srcdir}/${_gitname}-build"
   for sample in $MONO_SAMPLES; do
diff --git a/~lukeshu/openni-unstable/openni-core.install b/~lukeshu/openni-unstable/openni-core.install
new file mode 100644
index 000000000..8470f4512
--- /dev/null
+++ b/~lukeshu/openni-unstable/openni-core.install
@@ -0,0 +1,11 @@
+post_install() {
+	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
+	for module in $MODULES
+	do 
+		/usr/bin/niReg /usr/lib/$module
+	done
+}
+
+pre_remove() {
+	rm /var/lib/ni/modules.xml
+}
diff --git a/~lukeshu/openni-unstable/openni-mono.install b/~lukeshu/openni-unstable/openni-mono.install
new file mode 100644
index 000000000..72a6fb23d
--- /dev/null
+++ b/~lukeshu/openni-unstable/openni-mono.install
@@ -0,0 +1,7 @@
+post_install() {
+	gacutil -i /usr/share/openni/mono/OpenNI.net.dll -gacdir /usr
+}
+
+post_remove() {
+	gacutil -u OpenNI.net -gacdir /usr
+}
diff --git a/~lukeshu/svn-graph-branches/PKGBUILD b/~lukeshu/svn-graph-branches/PKGBUILD
new file mode 100644
index 000000000..63568e50c
--- /dev/null
+++ b/~lukeshu/svn-graph-branches/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=svn-graph-branches
+pkgver=0.10
+pkgrel=1
+pkgdesc="Parses the Subversion log of a repository to generate a graph of the important events of the project."
+arch=('any')
+url="https://code.google.com/p/svn-graph-branches/"
+license=('GPL')
+depends=('subversion' 'graphviz' 'java-environment')
+makedepends=('sharutils')
+source=(https://svn-graph-branches.googlecode.com/files/$pkgname-$pkgver.tar.gz)
+sha1sums=('c8b85b57b7725bc869f792334505d36d527e1dea')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  export CLASSPATH=`pwd`
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}