Ubuntu
blends package

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

  1. Raring (13.04)
  2. merge-from-debian
  3. Merge into raring
Proposed by Vibhav Pant
Status: Merged
Merged at revision: 16
Proposed branch: lp:~vibhavp/ubuntu/raring/blends/merge-from-debian
Merge into: lp:ubuntu/raring/blends
Diff against target: 36 lines (+17/-1)
2 files modified
debian/changelog (+16/-0)
devtools/rules (+1/-1)
To merge this branch: bzr merge lp:~vibhavp/ubuntu/raring/blends/merge-from-debian
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+140066@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-12-02 15:23:54 +0000
3+++ debian/changelog 2012-12-15 11:20:27 +0000
4@@ -1,3 +1,19 @@
5+blends (0.6.16.2ubuntu1) raring; urgency=low
6+
7+ * Merge from Debian unstable. Remaining changes:
8+ - Add sources.list.{karmic,lucid,maverick,natty,oneiric,precise,quantal,raring}
9+ so blends can be built for Ubuntu.
10+
11+ -- Vibhav Pant <vibhavp@ubuntu.com> Sat, 15 Dec 2012 16:39:55 +0530
12+
13+blends (0.6.16.2) unstable; urgency=low
14+
15+ * Install tasksel desc file to new location since version 3.00 of tasksel
16+ (thanks to Petter Reinholdtsen <pere@hungry.com> for the patch)
17+ Closes: #694896
18+
19+ -- Andreas Tille <tille@debian.org> Tue, 04 Dec 2012 11:00:45 +0100
20+
21 blends (0.6.16.1ubuntu1) raring; urgency=low
22
23 * Merge from Debian unstable. Remaining changes:
24
25=== modified file 'devtools/rules'
26--- devtools/rules 2010-11-10 20:32:31 +0000
27+++ devtools/rules 2012-12-15 11:20:27 +0000
28@@ -34,7 +34,7 @@
29
30 override_dh_install:
31 $(BLEND_INSTALL_HELPER)
32- dh_install $(BLENDNAME)-tasks.desc usr/share/tasksel
33+ dh_install $(BLENDNAME)-tasks.desc usr/share/tasksel/descs
34
35 override_dh_installdocs:
36 dh_installdocs $(INSTALLREADME)

Subscribers

People subscribed via source and target branches

to all changes: