Merge lp:~vibhavp/ubuntu/raring/blends/merge-from-debian into lp:ubuntu/raring/blends

[Vibhav Pant]

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-02 15:23:54 +0000
+++ debian/changelog	2012-12-15 11:20:27 +0000
@@ -1,3 +1,19 @@
+blends (0.6.16.2ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Add sources.list.{karmic,lucid,maverick,natty,oneiric,precise,quantal,raring}
+      so blends can be built for Ubuntu. 
+
+ -- Vibhav Pant <[e-mail]>  Sat, 15 Dec 2012 16:39:55 +0530
+
+blends (0.6.16.2) unstable; urgency=low
+
+  * Install tasksel desc file to new location since version 3.00 of tasksel
+    (thanks to Petter Reinholdtsen <[e-mail]> for the patch)
+    Closes: #694896
+
+ -- Andreas Tille <[e-mail]>  Tue, 04 Dec 2012 11:00:45 +0100
+
 blends (0.6.16.1ubuntu1) raring; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
 
=== modified file 'devtools/rules'
--- devtools/rules	2010-11-10 20:32:31 +0000
+++ devtools/rules	2012-12-15 11:20:27 +0000
@@ -34,7 +34,7 @@
 
 override_dh_install:
 	$(BLEND_INSTALL_HELPER)
-	dh_install $(BLENDNAME)-tasks.desc usr/share/tasksel
+	dh_install $(BLENDNAME)-tasks.desc usr/share/tasksel/descs
 
 override_dh_installdocs:
 	dh_installdocs $(INSTALLREADME)