Merge lp:~morphis/ubuntu-push/add-source-format into lp:ubuntu-push/automatic

Proposed by Simon Fels on 2016-05-03
Status: Merged
Approved by: Jonas G. Drange on 2016-05-03
Approved revision: 430
Merged at revision: 429
Proposed branch: lp:~morphis/ubuntu-push/add-source-format
Merge into: lp:ubuntu-push/automatic
Diff against target: 20 lines (+1/-4)
3 files modified
debian/source/format (+1/-0)
docs/example-server/.bzrignore (+0/-1)
docs/example-server/.gitignore (+0/-3)
To merge this branch: bzr merge lp:~morphis/ubuntu-push/add-source-format
Reviewer Review Type Date Requested Status
Jonas G. Drange (community) 2016-05-03 Approve on 2016-05-03
Review via email: mp+293599@code.launchpad.net

This proposal supersedes a proposal from 2016-05-03.

Commit message

Use source format 3.0 (quilt) again

Removing debian/source/ in a previous commit brough us back to source format 1.0 which doesn't preserve the executable flag on our debian/*.install files.

To post a comment you must log in.
Jonas G. Drange (jonas-drange) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'debian/source'
2=== added file 'debian/source/format'
3--- debian/source/format 1970-01-01 00:00:00 +0000
4+++ debian/source/format 2016-05-03 09:36:42 +0000
5@@ -0,0 +1,1 @@
6+3.0 (quilt)
7
8=== removed file 'docs/example-server/.bzrignore'
9--- docs/example-server/.bzrignore 2014-09-05 14:57:17 +0000
10+++ docs/example-server/.bzrignore 1970-01-01 00:00:00 +0000
11@@ -1,1 +0,0 @@
12-.git
13
14=== removed file 'docs/example-server/.gitignore'
15--- docs/example-server/.gitignore 2014-09-05 14:57:17 +0000
16+++ docs/example-server/.gitignore 1970-01-01 00:00:00 +0000
17@@ -1,3 +0,0 @@
18-.bzr
19-.bzrignore
20-node_modules

Subscribers

People subscribed via source and target branches