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

Proposed by Simon Fels
Status: Superseded
Proposed branch: lp:~morphis/ubuntu-push/add-source-format
Merge into: lp:ubuntu-push
Prerequisite: lp:ubuntu-push/automatic
Diff against target: 13 lines (+0/-4)
2 files modified
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
Ubuntu Push Hackers Pending
Review via email: mp+293591@code.launchpad.net

This proposal has been superseded by 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.
430. By Simon Fels

Drop files dpkg-source complains about

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'docs/example-server/.bzrignore'
2--- docs/example-server/.bzrignore 2014-09-05 14:57:17 +0000
3+++ docs/example-server/.bzrignore 1970-01-01 00:00:00 +0000
4@@ -1,1 +0,0 @@
5-.git
6
7=== removed file 'docs/example-server/.gitignore'
8--- docs/example-server/.gitignore 2014-09-05 14:57:17 +0000
9+++ docs/example-server/.gitignore 1970-01-01 00:00:00 +0000
10@@ -1,3 +0,0 @@
11-.bzr
12-.bzrignore
13-node_modules

Subscribers

People subscribed via source and target branches