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
diff --git a/debian/README.Debian b/debian/README.Debian
index 8d6f1f8..71e3d16 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,5 +1,5 @@
1iwlwifi-dkms for Debian1backport-iwlwifi-dkms for Debian
2-----------------------2--------------------------------
33
4This package is based on backport-iwlwifi[1] hosted on git.kernel.org4This package is based on backport-iwlwifi[1] hosted on git.kernel.org
5and is packaged in deb format for Debian/Ubuntu users.5and is packaged in deb format for Debian/Ubuntu users.
diff --git a/debian/iwlwifi-dkms.dkms.in b/debian/backport-iwlwifi-dkms.dkms.in
6similarity index 100%6similarity index 100%
7rename from debian/iwlwifi-dkms.dkms.in7rename from debian/iwlwifi-dkms.dkms.in
8rename to debian/backport-iwlwifi-dkms.dkms.in8rename to debian/backport-iwlwifi-dkms.dkms.in
diff --git a/debian/iwlwifi-dkms.install.in b/debian/backport-iwlwifi-dkms.install.in
9similarity index 100%9similarity index 100%
10rename from debian/iwlwifi-dkms.install.in10rename from debian/iwlwifi-dkms.install.in
11rename to debian/backport-iwlwifi-dkms.install.in11rename to debian/backport-iwlwifi-dkms.install.in
diff --git a/debian/changelog b/debian/changelog
index ad2962e..5aebdfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
1iwlwifi-dkms (7744-ubuntu3) UNRELEASED; urgency=low1backport-iwlwifi-dkms (7744-ubuntu3) UNRELEASED; urgency=low
22
3 * sync with debian 7744+deb1.3 * sync with debian 7744+deb1.
4 * use CI definitions from salsa-ci-team/pipeline4 * use CI definitions from salsa-ci-team/pipeline
@@ -7,19 +7,19 @@ iwlwifi-dkms (7744-ubuntu3) UNRELEASED; urgency=low
77
8 -- You-Sheng Yang <vicamo@gmail.com> Thu, 30 May 2019 16:02:20 +08008 -- You-Sheng Yang <vicamo@gmail.com> Thu, 30 May 2019 16:02:20 +0800
99
10iwlwifi-dkms (7744-ubuntu2) UNRELEASED; urgency=low10backport-iwlwifi-dkms (7744-ubuntu2) UNRELEASED; urgency=low
1111
12 * Use DEB_VERSION_UPSTREAM for installed dkms source.12 * Use DEB_VERSION_UPSTREAM for installed dkms source.
1313
14 -- You-Sheng Yang <vicamo@gmail.com> Thu, 30 May 2019 16:02:20 +080014 -- You-Sheng Yang <vicamo@gmail.com> Thu, 30 May 2019 16:02:20 +0800
1515
16iwlwifi-dkms (7744-ubuntu1) UNRELEASED; urgency=low16backport-iwlwifi-dkms (7744-ubuntu1) UNRELEASED; urgency=low
1717
18 * Close lp:1830822.18 * Close lp:1830822.
1919
20 -- You-Sheng Yang <vicamo@gmail.com> Tue, 28 May 2019 15:53:12 +080020 -- You-Sheng Yang <vicamo@gmail.com> Tue, 28 May 2019 15:53:12 +0800
2121
22iwlwifi-dkms (7744) UNRELEASED; urgency=low22backport-iwlwifi-dkms (7744) UNRELEASED; urgency=low
2323
24 * Initial release (Closes: 929692)24 * Initial release (Closes: 929692)
2525
diff --git a/debian/control b/debian/control
index d52238e..4677d8d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
1Source: iwlwifi-dkms1Source: backport-iwlwifi-dkms
2Section: kernel2Section: kernel
3Priority: optional3Priority: optional
4Maintainer: You-Sheng Yang <vicamo@gmail.com>4Maintainer: You-Sheng Yang <vicamo@gmail.com>
@@ -7,11 +7,11 @@ Build-Depends:
7 dkms,7 dkms,
8 quilt,8 quilt,
9Standards-Version: 4.3.09Standards-Version: 4.3.0
10Homepage: https://gitlab.com/vicamo/iwlwifi-dkms10Homepage: https://gitlab.com/vicamo/backport-iwlwifi-dkms
11Vcs-Browser: https://gitlab.com/vicamo/iwlwifi-dkms/tree/master11Vcs-Browser: https://gitlab.com/vicamo/backport-iwlwifi-dkms/tree/master
12Vcs-Git: https://gitlab.com/vicamo/iwlwifi-dkms.git12Vcs-Git: https://gitlab.com/vicamo/backport-iwlwifi-dkms.git
1313
14Package: iwlwifi-dkms14Package: backport-iwlwifi-dkms
15Architecture: all15Architecture: all
16Depends:16Depends:
17 dkms,17 dkms,
diff --git a/debian/rules b/debian/rules
index 39a5288..5075f74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,11 @@
3#export DH_VERBOSE = 13#export DH_VERBOSE = 1
4include /usr/share/dpkg/pkg-info.mk4include /usr/share/dpkg/pkg-info.mk
55
6DKMS_PACKAGE_NAME=iwlwifi-backport6DKMS_PACKAGE_NAME=backport-iwlwifi
7DKMS_PACKAGE_VERSION=$(DEB_VERSION_UPSTREAM)7DKMS_PACKAGE_VERSION=$(DEB_VERSION_UPSTREAM)
8GENERATED_DKMS_FILES= \8GENERATED_DKMS_FILES= \
9 debian/iwlwifi-dkms.install \9 debian/backport-iwlwifi-dkms.install \
10 debian/iwlwifi-dkms.dkms10 debian/backport-iwlwifi-dkms.dkms
1111
12%:12%:
13 dh $@ --with dkms,quilt13 dh $@ --with dkms,quilt
@@ -22,10 +22,10 @@ override_dh_clean:
22 -rm -f $(GENERATED_DKMS_FILES)22 -rm -f $(GENERATED_DKMS_FILES)
23 dh_clean23 dh_clean
2424
25override_dh_install: debian/iwlwifi-dkms.install25override_dh_install: debian/backport-iwlwifi-dkms.install
26 dh_install --exclude=.gitignore26 dh_install --exclude=.gitignore
2727
28override_dh_dkms: debian/iwlwifi-dkms.dkms28override_dh_dkms: debian/backport-iwlwifi-dkms.dkms
29 dh_dkms -V $(DKMS_PACKAGE_VERSION)29 dh_dkms -V $(DKMS_PACKAGE_VERSION)
3030
31$(GENERATED_DKMS_FILES) : $(GENERATED_DKMS_FILES:=.in) debian/rules31$(GENERATED_DKMS_FILES) : $(GENERATED_DKMS_FILES:=.in) debian/rules
diff --git a/debian/tests/control b/debian/tests/control
index 2d9c20a..44c36f1 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,5 +3,5 @@ Restrictions:
3 needs-root,3 needs-root,
4 allow-stderr,4 allow-stderr,
5Depends:5Depends:
6 iwlwifi-dkms,6 backport-iwlwifi-dkms,
7 linux-headers-686-pae | linux-headers-amd64 | linux-headers-generic | linux-headers,7 linux-headers-686-pae | linux-headers-amd64 | linux-headers-generic | linux-headers,

Subscribers

People subscribed via source and target branches