1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
From:
Subject: Debian changes
The Debian packaging of propellor is maintained in git, using a workflow
similar to the one described in dgit-maint-merge(7).
The Debian delta is represented by this one combined patch; there isn't a
patch queue that can be represented as a quilt series.
A detailed breakdown of the changes is available from their canonical
representation -- git commits in the packaging repository.
For example, to see the changes made by the Debian maintainer in the first
upload of upstream version 1.2.3, you could use:
% git clone https://git.dgit.debian.org/propellor
% cd propellor
% git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
(If you have dgit, use `dgit clone propellor`, rather than plain `git clone`.)
We don't use debian/source/options single-debian-patch because it has bugs.
Therefore, NMUs etc. may nevertheless have made additional patches.
---
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..5d425843
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs
diff --git a/Makefile b/Makefile
index 4351f70f..00c01720 100644
--- a/Makefile
+++ b/Makefile
@@ -9,16 +9,22 @@ build: tags propellor.1 configured
ln -sf dist/build/propellor-config/propellor-config propellor; \
fi
-install:
- install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/src/propellor
+install: install-bin install-src
+
+install-bin:
+ install -d $(DESTDIR)/usr/bin
if [ -d dist-newstyle ]; then \
install -s $$(cabal exec -- sh -c 'command -v propellor') $(DESTDIR)/usr/bin/propellor; \
else \
install -s dist/build/propellor/propellor $(DESTDIR)/usr/bin/propellor; \
fi
+
+install-src:
+ install -d $(DESTDIR)/usr/src/propellor
mkdir -p gittmp
- if [ "$(CABAL)" = ./Setup ]; then \
- ./Setup sdist --output-directory=gittmp; \
+ # cabal outputs an archive while the setup program outputs files
+ if [ -z "$(findstring cabal,$(CABAL))" ]; then \
+ $(CABAL) sdist --output-directory=gittmp; \
else \
$(CABAL) sdist -o - | (cd gittmp && tar zx --strip-components=1); \
fi
@@ -32,7 +38,7 @@ install:
&& export GIT_COMMITTER_NAME=build \
&& export GIT_COMMITTER_EMAIL=build@buildhost \
&& export GIT_COMMITTER_DATE="$(DATE)" \
- && cd gittmp && git init \
+ && cd gittmp && git init -b master \
&& git add . \
&& git commit -q -m "distributed version of propellor" \
&& git bundle create $(DESTDIR)/usr/src/propellor/propellor.git master HEAD \
diff --git a/propellor.cabal b/propellor.cabal
index 7adab8ff..13491b94 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -23,7 +23,6 @@ Extra-Source-Files:
stack.yaml
debian/changelog
debian/propellor.README.Debian
- debian/compat
debian/control
debian/copyright
debian/rules
|
