dee

Merge lp:~didrocks/dee/fix-typelib into lp:dee

Proposed by Didier Roche on 2012-11-09
Status: Merged
Approved by: Michal Hruby on 2012-11-09
Approved revision: no longer in the source branch.
Merged at revision: 382
Proposed branch: lp:~didrocks/dee/fix-typelib
Merge into: lp:dee
Diff against target: 26 lines (+6/-3)
2 files modified
debian/changelog (+5/-2)
debian/gir1.2-dee-1.0.install (+1/-1)
To merge this branch: bzr merge lp:~didrocks/dee/fix-typelib
Reviewer Review Type Date Requested Status
Michal Hruby (community) 2012-11-09 Approve on 2012-11-09
PS Jenkins bot continuous-integration Pending
Review via email: mp+133631@code.launchpad.net

Commit Message

Move the typelib file to a non multiarch dir

Description of the Change

Move the typelib file to a non multiarch dir
(multiarch is only supported by debian/ubuntu, so don't do that upstream)

To post a comment you must log in.
Michal Hruby (mhr3) wrote :

Looks good, "support" is indeed spelled with just two p.

review: Approve
lp:~didrocks/dee/fix-typelib updated on 2012-11-09
382. By Didier Roche on 2012-11-09

Move the typelib file to a non multiarch dir. Approved by Michal Hruby.

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-11-08 07:36:04 +0000
3+++ debian/changelog 2012-11-09 09:41:26 +0000
4@@ -8,9 +8,12 @@
5
6 [ Didier Roche ]
7 * debian/rules:
8- - Call dh_python3 for python3 suppport
9+ - Call dh_python3 for python3 support
10+ * debian/gir1.2-dee-1.0.install:
11+ - We don't support multiarch for typelibs yet in ubuntu, move it back
12+ to the all arch dir
13
14- -- Michael Terry <mterry@ubuntu.com> Mon, 05 Nov 2012 15:28:38 -0500
15+ -- Didier Roche <didrocks@ubuntu.com> Fri, 09 Nov 2012 10:32:42 +0100
16
17 dee (1.0.14-0ubuntu1) quantal; urgency=low
18
19
20=== modified file 'debian/gir1.2-dee-1.0.install'
21--- debian/gir1.2-dee-1.0.install 2012-11-07 20:44:13 +0000
22+++ debian/gir1.2-dee-1.0.install 2012-11-09 09:41:26 +0000
23@@ -1,2 +1,2 @@
24-debian/tmp/usr/lib/*/girepository-1.0/
25+debian/tmp/usr/lib/*/girepository-1.0/ debian/tmp/usr/lib/
26 debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.py

Subscribers

People subscribed via source and target branches

to all changes: