Merge ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:for-hwe/various-fixes-before-debian-itp into ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:ubuntu/master

[You-Sheng Yang]

Sync with debian/master to fix build failure on systems without libc-dev preinstalled.

[You-Sheng Yang (vicamo)]

Test build in https://code.launchpad.net/~vicamo/+recipe/test-for-hwe-various-fixes-before-debian-itp

[You-Sheng Yang (vicamo)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 862020f..ad2962e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+iwlwifi-dkms (7744-ubuntu3) UNRELEASED; urgency=low
+
+  * sync with debian 7744+deb1.
+  * use CI definitions from salsa-ci-team/pipeline
+  * add dependency to libc-dev
+  * rewrite debian/rules a bit
+
+ -- You-Sheng Yang <[e-mail]>  Thu, 30 May 2019 16:02:20 +0800
+
 iwlwifi-dkms (7744-ubuntu2) UNRELEASED; urgency=low
 
   * Use DEB_VERSION_UPSTREAM for installed dkms source.
@@ -12,6 +21,6 @@ iwlwifi-dkms (7744-ubuntu1) UNRELEASED; urgency=low
 
 iwlwifi-dkms (7744) UNRELEASED; urgency=low
 
-  * Initial release
+  * Initial release (Closes: 929692)
 
  -- You-Sheng Yang <[e-mail]>  Thu, 23 May 2019 14:10:43 +0800
diff --git a/debian/control b/debian/control
index 334704a..d52238e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Package: iwlwifi-dkms
 Architecture: all
 Depends:
  dkms,
+ libc6-dev | libc-dev,
  ${misc:Depends},
 Provides: iwlwifi-modules
 Description: iwlwifi driver backport in DKMS format
diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml
index 80e0981..ac7bc44 100644
--- a/debian/gitlab-ci.yml
+++ b/debian/gitlab-ci.yml
@@ -1,6 +1,6 @@
 include:
-  - https://gitlab.com/vicamo/debian-pipeline/raw/master/salsa-ci.yml
-  - https://gitlab.com/vicamo/debian-pipeline/raw/master/salsa-ci-simple.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
 
 variables:
-  SKIP_PREREQUISITES: 'yes'
+  RELEASE: 'unstable'
diff --git a/debian/iwlwifi-dkms.dkms.in b/debian/iwlwifi-dkms.dkms.in
index c540747..285c400 100644
--- a/debian/iwlwifi-dkms.dkms.in
+++ b/debian/iwlwifi-dkms.dkms.in
@@ -1,4 +1,4 @@
-PACKAGE_NAME="iwlwifi"
+PACKAGE_NAME="@DKMS_PACKAGE_NAME@"
 PACKAGE_VERSION="#MODULE_VERSION#"
 AUTOINSTALL="yes"
 
diff --git a/debian/iwlwifi-dkms.install.in b/debian/iwlwifi-dkms.install.in
index cf93935..6ce27a1 100644
--- a/debian/iwlwifi-dkms.install.in
+++ b/debian/iwlwifi-dkms.install.in
@@ -1,14 +1,14 @@
-Kconfig*		/usr/src/iwlwifi-@DEB_VERSION_UPSTREAM@
-Makefile*		/usr/src/iwlwifi-@DEB_VERSION_UPSTREAM@
-backport-include	/usr/src/iwlwifi-@DEB_VERSION_UPSTREAM@
-compat			/usr/src/iwlwifi-@DEB_VERSION_UPSTREAM@
-defconfig		/usr/src/iwlwifi-@DEB_VERSION_UPSTREAM@
-defconfigs		/usr/src/iwlwifi-@DEB_VERSION_UPSTREAM@
-drivers			/usr/src/iwlwifi-@DEB_VERSION_UPSTREAM@
-include			/usr/src/iwlwifi-@DEB_VERSION_UPSTREAM@
-intc-scripts		/usr/src/iwlwifi-@DEB_VERSION_UPSTREAM@
-kconf			/usr/src/iwlwifi-@DEB_VERSION_UPSTREAM@
-local-symbols		/usr/src/iwlwifi-@DEB_VERSION_UPSTREAM@
-net			/usr/src/iwlwifi-@DEB_VERSION_UPSTREAM@
-scripts			/usr/src/iwlwifi-@DEB_VERSION_UPSTREAM@
-versions		/usr/src/iwlwifi-@DEB_VERSION_UPSTREAM@
+Kconfig*		/usr/src/@DKMS_PACKAGE_NAME@-@DKMS_PACKAGE_VERSION@
+Makefile*		/usr/src/@DKMS_PACKAGE_NAME@-@DKMS_PACKAGE_VERSION@
+backport-include	/usr/src/@DKMS_PACKAGE_NAME@-@DKMS_PACKAGE_VERSION@
+compat			/usr/src/@DKMS_PACKAGE_NAME@-@DKMS_PACKAGE_VERSION@
+defconfig		/usr/src/@DKMS_PACKAGE_NAME@-@DKMS_PACKAGE_VERSION@
+defconfigs		/usr/src/@DKMS_PACKAGE_NAME@-@DKMS_PACKAGE_VERSION@
+drivers			/usr/src/@DKMS_PACKAGE_NAME@-@DKMS_PACKAGE_VERSION@
+include			/usr/src/@DKMS_PACKAGE_NAME@-@DKMS_PACKAGE_VERSION@
+intc-scripts		/usr/src/@DKMS_PACKAGE_NAME@-@DKMS_PACKAGE_VERSION@
+kconf			/usr/src/@DKMS_PACKAGE_NAME@-@DKMS_PACKAGE_VERSION@
+local-symbols		/usr/src/@DKMS_PACKAGE_NAME@-@DKMS_PACKAGE_VERSION@
+net			/usr/src/@DKMS_PACKAGE_NAME@-@DKMS_PACKAGE_VERSION@
+scripts			/usr/src/@DKMS_PACKAGE_NAME@-@DKMS_PACKAGE_VERSION@
+versions		/usr/src/@DKMS_PACKAGE_NAME@-@DKMS_PACKAGE_VERSION@
diff --git a/debian/rules b/debian/rules
index ea9dd90..39a5288 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,12 @@
 #export DH_VERBOSE = 1
 include /usr/share/dpkg/pkg-info.mk
 
+DKMS_PACKAGE_NAME=iwlwifi-backport
+DKMS_PACKAGE_VERSION=$(DEB_VERSION_UPSTREAM)
+GENERATED_DKMS_FILES= \
+    debian/iwlwifi-dkms.install \
+    debian/iwlwifi-dkms.dkms
+
 %:
 	dh $@ --with dkms,quilt
 
@@ -13,18 +19,16 @@ override_dh_auto_install:
 override_dh_auto_clean:
 
 override_dh_clean:
-	-rm -f debian/iwlwifi-dkms.dkms
-	-rm -f debian/iwlwifi-dkms.install
+	-rm -f $(GENERATED_DKMS_FILES)
 	dh_clean
 
 override_dh_install: debian/iwlwifi-dkms.install
 	dh_install --exclude=.gitignore
 
 override_dh_dkms: debian/iwlwifi-dkms.dkms
-	dh_dkms -V $(DEB_VERSION_UPSTREAM)
-
-debian/iwlwifi-dkms.install: debian/iwlwifi-dkms.install.in
-	sed -e 's,@DEB_VERSION_UPSTREAM@,$(DEB_VERSION_UPSTREAM),g' <$< >$@
+	dh_dkms -V $(DKMS_PACKAGE_VERSION)
 
-debian/iwlwifi-dkms.dkms: debian/iwlwifi-dkms.dkms.in
-	sed -e 's,@DEB_VERSION_UPSTREAM@,$(DEB_VERSION_UPSTREAM),g' <$< >$@
+$(GENERATED_DKMS_FILES) : $(GENERATED_DKMS_FILES:=.in) debian/rules
+	sed -e 's,@DKMS_PACKAGE_NAME@,$(DKMS_PACKAGE_NAME),g' \
+	    -e 's,@DKMS_PACKAGE_VERSION@,$(DKMS_PACKAGE_VERSION),g' \
+	    <$(@:=.in) >$@