Merge ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:for-hwe/rename-package into ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:ubuntu/master

Proposed by You-Sheng Yang
Status: Merged
Merged at revision: 051f5984bd61b8e16ef663fd3fa6d515579f0994
Proposed branch: ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:for-hwe/rename-package
Merge into: ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:ubuntu/master
Diff against target: 122 lines (+17/-17)
5 files modified
debian/README.Debian (+2/-2)
debian/changelog (+4/-4)
debian/control (+5/-5)
debian/rules (+5/-5)
debian/tests/control (+1/-1)
Reviewer Review Type Date Requested Status
Anthony Wong Approve
Review via email: mp+368295@code.launchpad.net

Commit message

Merge remote-tracking branch 'vicamo/debian/master' into ubuntu/master

Description of the change

Sync with debian/master that renames source/binary package to include prefix 'backport-'.

To post a comment you must log in.
Revision history for this message
You-Sheng Yang (vicamo) wrote :
Revision history for this message
Anthony Wong (anthonywong) wrote :

Look good to me, thanks for making the change.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/README.Debian b/debian/README.Debian
2index 8d6f1f8..71e3d16 100644
3--- a/debian/README.Debian
4+++ b/debian/README.Debian
5@@ -1,5 +1,5 @@
6-iwlwifi-dkms for Debian
7------------------------
8+backport-iwlwifi-dkms for Debian
9+--------------------------------
10
11 This package is based on backport-iwlwifi[1] hosted on git.kernel.org
12 and is packaged in deb format for Debian/Ubuntu users.
13diff --git a/debian/iwlwifi-dkms.dkms.in b/debian/backport-iwlwifi-dkms.dkms.in
14similarity index 100%
15rename from debian/iwlwifi-dkms.dkms.in
16rename to debian/backport-iwlwifi-dkms.dkms.in
17diff --git a/debian/iwlwifi-dkms.install.in b/debian/backport-iwlwifi-dkms.install.in
18similarity index 100%
19rename from debian/iwlwifi-dkms.install.in
20rename to debian/backport-iwlwifi-dkms.install.in
21diff --git a/debian/changelog b/debian/changelog
22index ad2962e..5aebdfe 100644
23--- a/debian/changelog
24+++ b/debian/changelog
25@@ -1,4 +1,4 @@
26-iwlwifi-dkms (7744-ubuntu3) UNRELEASED; urgency=low
27+backport-iwlwifi-dkms (7744-ubuntu3) UNRELEASED; urgency=low
28
29 * sync with debian 7744+deb1.
30 * use CI definitions from salsa-ci-team/pipeline
31@@ -7,19 +7,19 @@ iwlwifi-dkms (7744-ubuntu3) UNRELEASED; urgency=low
32
33 -- You-Sheng Yang <vicamo@gmail.com> Thu, 30 May 2019 16:02:20 +0800
34
35-iwlwifi-dkms (7744-ubuntu2) UNRELEASED; urgency=low
36+backport-iwlwifi-dkms (7744-ubuntu2) UNRELEASED; urgency=low
37
38 * Use DEB_VERSION_UPSTREAM for installed dkms source.
39
40 -- You-Sheng Yang <vicamo@gmail.com> Thu, 30 May 2019 16:02:20 +0800
41
42-iwlwifi-dkms (7744-ubuntu1) UNRELEASED; urgency=low
43+backport-iwlwifi-dkms (7744-ubuntu1) UNRELEASED; urgency=low
44
45 * Close lp:1830822.
46
47 -- You-Sheng Yang <vicamo@gmail.com> Tue, 28 May 2019 15:53:12 +0800
48
49-iwlwifi-dkms (7744) UNRELEASED; urgency=low
50+backport-iwlwifi-dkms (7744) UNRELEASED; urgency=low
51
52 * Initial release (Closes: 929692)
53
54diff --git a/debian/control b/debian/control
55index d52238e..4677d8d 100644
56--- a/debian/control
57+++ b/debian/control
58@@ -1,4 +1,4 @@
59-Source: iwlwifi-dkms
60+Source: backport-iwlwifi-dkms
61 Section: kernel
62 Priority: optional
63 Maintainer: You-Sheng Yang <vicamo@gmail.com>
64@@ -7,11 +7,11 @@ Build-Depends:
65 dkms,
66 quilt,
67 Standards-Version: 4.3.0
68-Homepage: https://gitlab.com/vicamo/iwlwifi-dkms
69-Vcs-Browser: https://gitlab.com/vicamo/iwlwifi-dkms/tree/master
70-Vcs-Git: https://gitlab.com/vicamo/iwlwifi-dkms.git
71+Homepage: https://gitlab.com/vicamo/backport-iwlwifi-dkms
72+Vcs-Browser: https://gitlab.com/vicamo/backport-iwlwifi-dkms/tree/master
73+Vcs-Git: https://gitlab.com/vicamo/backport-iwlwifi-dkms.git
74
75-Package: iwlwifi-dkms
76+Package: backport-iwlwifi-dkms
77 Architecture: all
78 Depends:
79 dkms,
80diff --git a/debian/rules b/debian/rules
81index 39a5288..5075f74 100755
82--- a/debian/rules
83+++ b/debian/rules
84@@ -3,11 +3,11 @@
85 #export DH_VERBOSE = 1
86 include /usr/share/dpkg/pkg-info.mk
87
88-DKMS_PACKAGE_NAME=iwlwifi-backport
89+DKMS_PACKAGE_NAME=backport-iwlwifi
90 DKMS_PACKAGE_VERSION=$(DEB_VERSION_UPSTREAM)
91 GENERATED_DKMS_FILES= \
92- debian/iwlwifi-dkms.install \
93- debian/iwlwifi-dkms.dkms
94+ debian/backport-iwlwifi-dkms.install \
95+ debian/backport-iwlwifi-dkms.dkms
96
97 %:
98 dh $@ --with dkms,quilt
99@@ -22,10 +22,10 @@ override_dh_clean:
100 -rm -f $(GENERATED_DKMS_FILES)
101 dh_clean
102
103-override_dh_install: debian/iwlwifi-dkms.install
104+override_dh_install: debian/backport-iwlwifi-dkms.install
105 dh_install --exclude=.gitignore
106
107-override_dh_dkms: debian/iwlwifi-dkms.dkms
108+override_dh_dkms: debian/backport-iwlwifi-dkms.dkms
109 dh_dkms -V $(DKMS_PACKAGE_VERSION)
110
111 $(GENERATED_DKMS_FILES) : $(GENERATED_DKMS_FILES:=.in) debian/rules
112diff --git a/debian/tests/control b/debian/tests/control
113index 2d9c20a..44c36f1 100644
114--- a/debian/tests/control
115+++ b/debian/tests/control
116@@ -3,5 +3,5 @@ Restrictions:
117 needs-root,
118 allow-stderr,
119 Depends:
120- iwlwifi-dkms,
121+ backport-iwlwifi-dkms,
122 linux-headers-686-pae | linux-headers-amd64 | linux-headers-generic | linux-headers,

Subscribers

People subscribed via source and target branches