diff -Nru yui-2.8.2r1~squeeze/debian/changelog yui-2.8.2r1~squeeze/debian/changelog
--- yui-2.8.2r1~squeeze/debian/changelog	2012-06-20 11:14:23.000000000 -0400
+++ yui-2.8.2r1~squeeze/debian/changelog	2012-06-20 11:06:08.000000000 -0400
@@ -1,3 +1,19 @@
+yui (2.8.2r1~squeeze-2) unstable; urgency=low
+
+  * Switch to dh7.
+    - debian/control: Bump debhelper build-dep to (>= 7.0.50~)
+    - debian/rules: Use dh7.
+  * Transition to a versioned installation path:
+    - debian/control: Make libjs-yui a transitional package; Add
+      libjs-yui2.8 binary package.
+    - Move debian/libjs-yui.{dirs,install,lintian-overrides} to
+      libjs-yui2.8.{dirs,install,lintian-overrides} respectively.
+    - debian/rules: Install to a versioned directory.
+  * debian/watch: Update with correct URL.
+  * debian/source/format: 3.0 (quilt)
+
+ -- Andres Rodriguez <andreserl@ubuntu.com>  Wed, 20 Jun 2012 11:05:57 -0400
+
 yui (2.8.2r1~squeeze-1) unstable; urgency=high
 
   * New upstream version targeted at squeeze.
diff -Nru yui-2.8.2r1~squeeze/debian/control yui-2.8.2r1~squeeze/debian/control
--- yui-2.8.2r1~squeeze/debian/control	2012-06-20 11:14:23.000000000 -0400
+++ yui-2.8.2r1~squeeze/debian/control	2012-06-20 10:28:07.000000000 -0400
@@ -4,7 +4,7 @@
 Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.debian.org>
 Uploaders: Jaldhar H. Vyas <jaldhar@debian.org>,
            Marcelo Jorge Vieira (metal) <metal@debian.org>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.50~)
 Standards-Version: 3.9.1
 Homepage: http://developer.yahoo.com/yui/
 Vcs-Browser: http://git.debian.org/?p=pkg-javascript/yui.git
@@ -14,6 +14,26 @@
 Package: libjs-yui
 Section: web
 Architecture: all
+Depends: libjs-yui2.8
+Description: Yahoo User Interface Library (transitional package)
+ A collection of HTML, CSS, and JavaScript components for creating AJAX web
+ pages. The library currently includes:
+ .
+  * utility classes for animation, browser history, AJAX, cookies, 
+    drag and drop. safe cross-site data retrieval, dynamic script/css loading,
+    image loading, selectors, JSON, resizing elements, DOM and browser events.
+  * Autocomplete, button, calendar, carousel, charts, color picker,
+    data table, file upload, image crop, menu, paginator, layout manager,
+    rich text editor, slider, tabview and treeview controls and a container
+    control that can be used for tooltips, panels, dialog boxes etc.
+  * A logging framework.
+  * A profiler
+  * A test framework
+  * Cascading stylesheets for browser-independent grids and fonts.
+
+Package: libjs-yui2.8
+Section: web
+Architecture: all
 Depends: ${misc:Depends}
 Recommends: javascript-common
 Description: Yahoo User Interface Library
diff -Nru yui-2.8.2r1~squeeze/debian/libjs-yui2.8.dirs yui-2.8.2r1~squeeze/debian/libjs-yui2.8.dirs
--- yui-2.8.2r1~squeeze/debian/libjs-yui2.8.dirs	1969-12-31 19:00:00.000000000 -0500
+++ yui-2.8.2r1~squeeze/debian/libjs-yui2.8.dirs	2012-06-11 11:35:44.000000000 -0400
@@ -0,0 +1 @@
+/usr/share/javascript/yui
diff -Nru yui-2.8.2r1~squeeze/debian/libjs-yui2.8.install yui-2.8.2r1~squeeze/debian/libjs-yui2.8.install
--- yui-2.8.2r1~squeeze/debian/libjs-yui2.8.install	1969-12-31 19:00:00.000000000 -0500
+++ yui-2.8.2r1~squeeze/debian/libjs-yui2.8.install	2012-06-20 11:04:43.000000000 -0400
@@ -0,0 +1 @@
+releasenotes /usr/share/doc/libjs-yui
diff -Nru yui-2.8.2r1~squeeze/debian/libjs-yui2.8.lintian-overrides yui-2.8.2r1~squeeze/debian/libjs-yui2.8.lintian-overrides
--- yui-2.8.2r1~squeeze/debian/libjs-yui2.8.lintian-overrides	1969-12-31 19:00:00.000000000 -0500
+++ yui-2.8.2r1~squeeze/debian/libjs-yui2.8.lintian-overrides	2012-06-11 11:35:44.000000000 -0400
@@ -0,0 +1 @@
+libjs-yui binary: embedded-javascript-library
diff -Nru yui-2.8.2r1~squeeze/debian/libjs-yui.dirs yui-2.8.2r1~squeeze/debian/libjs-yui.dirs
--- yui-2.8.2r1~squeeze/debian/libjs-yui.dirs	2012-06-20 11:14:23.000000000 -0400
+++ yui-2.8.2r1~squeeze/debian/libjs-yui.dirs	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-/usr/share/javascript/yui
diff -Nru yui-2.8.2r1~squeeze/debian/libjs-yui.install yui-2.8.2r1~squeeze/debian/libjs-yui.install
--- yui-2.8.2r1~squeeze/debian/libjs-yui.install	2012-06-20 11:14:23.000000000 -0400
+++ yui-2.8.2r1~squeeze/debian/libjs-yui.install	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-build/*		/usr/share/javascript/yui
-assets/*	/usr/share/javascript/yui/assets
-releasenotes /usr/share/doc/libjs-yui
diff -Nru yui-2.8.2r1~squeeze/debian/libjs-yui.lintian-overrides yui-2.8.2r1~squeeze/debian/libjs-yui.lintian-overrides
--- yui-2.8.2r1~squeeze/debian/libjs-yui.lintian-overrides	2012-06-20 11:14:23.000000000 -0400
+++ yui-2.8.2r1~squeeze/debian/libjs-yui.lintian-overrides	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-libjs-yui binary: embedded-javascript-library
diff -Nru yui-2.8.2r1~squeeze/debian/rules yui-2.8.2r1~squeeze/debian/rules
--- yui-2.8.2r1~squeeze/debian/rules	2012-06-20 11:14:23.000000000 -0400
+++ yui-2.8.2r1~squeeze/debian/rules	2012-06-20 11:09:50.000000000 -0400
@@ -1,26 +1,21 @@
 #!/usr/bin/make -f
 
-clean:
-	dh_testdir
-	dh_testroot
-
-	dh_clean
-
-build:
-
-install:
-
-binary: binary-indep
-
-binary-arch:
-
-binary-indep:
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_install -i 
+DEB_DEBIAN_DIR=$(dir $(firstword $(MAKEFILE_LIST)))
+VER=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \
+              | sed -rne 's,^Version: ([^-][a-zA-Z0-9.]+).*,\1,p')
+MVER=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \
+              | sed -rne 's,^Version: ([^-]..).*,\1,p')
+%:
+	dh $@
+
+override_dh_install:
+	# Install what's listed in debian/libjs-yui2.8.install
+	dh_install
+
+	# Install YUI in versioned dir
+	install -d -m 755 $(CURDIR)/debian/libjs-yui$(MVER)/usr/share/javascript/yui/$(VER)/
+	cp -r $(CURDIR)/build/* $(CURDIR)/debian/libjs-yui$(MVER)/usr/share/javascript/yui/$(VER)/
+	cp -r $(CURDIR)/assets $(CURDIR)/debian/libjs-yui$(MVER)/usr/share/javascript/yui/$(VER)/
 
 	# Adjusting file locations
 	find debian/libjs-yui-doc/usr/share/doc/libjs-yui-doc/examples -name "*.html" | \
@@ -46,13 +41,3 @@
 
 	find debian/libjs-yui/usr/share/javascript/yui -name "*.html" | \
 	xargs perl -pi -e 's#\Q../../build\E#/javascript/yui#g;'
-
-	dh_lintian -i
-	dh_compress -i -X.js -X-js -X.json -X.php
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-.PHONY: clean build install binary binary-arch binary-indep
diff -Nru yui-2.8.2r1~squeeze/debian/source/format yui-2.8.2r1~squeeze/debian/source/format
--- yui-2.8.2r1~squeeze/debian/source/format	1969-12-31 19:00:00.000000000 -0500
+++ yui-2.8.2r1~squeeze/debian/source/format	2012-06-20 11:05:54.000000000 -0400
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru yui-2.8.2r1~squeeze/debian/watch yui-2.8.2r1~squeeze/debian/watch
--- yui-2.8.2r1~squeeze/debian/watch	2012-06-20 11:14:23.000000000 -0400
+++ yui-2.8.2r1~squeeze/debian/watch	2012-06-11 12:47:55.000000000 -0400
@@ -1,2 +1,3 @@
 version=3
-http://yuilibrary.com/downloads/ .*yui2/yui_(.*).zip
+http://yuilibrary.com/download/yui3/ \
+         http://yui.zenfs.com/releases/yui3/yui_([\d\.]*).zip
