debian/control

@@ -43,7 +43,8 @@ Build-Depends:
  libdbus-1-dev [linux-any],
  nfs-common,
  systemtap-sdt-dev [amd64 armel armhf i386 ia64 powerpc s390],
- python,
+ python3,
+ python3-docutils,
  xsltproc,
  zfsutils [kfreebsd-amd64 kfreebsd-i386],
  po-debconf,

debian/libvirt-daemon-system.examples

-src/remote/libvirtd.conf
 src/remote/libvirtd.policy
-src/remote/libvirtd.sasl
 src/remote/libvirtd.sysctl

debian/libvirt-doc.doc-base.libvirt-doc

@@ -4,5 +4,5 @@ Abstract: Local copy of the web site of libvirt
 Section: System/Administration
 
 Format: HTML
-Index: /usr/share/doc/libvirt-doc/index.html
-Files: /usr/share/doc/libvirt-doc/*.html
+Index: /usr/share/doc/libvirt-doc/html/index.html
+Files: /usr/share/doc/libvirt-doc/html/*.html

debian/libvirt-doc.docs

-docs/*.rng
-docs/*.png
-docs/*.xml
-docs/*.html
-docs/*.gif
-docs/*.css
-docs/html/
-docs/devhelp/
-docs/internals/
-docs/kbase/
-docs/logos/
-examples/
+/usr/share/doc/libvirt/*

debian/libvirt0.symbols

@@ -121,7 +121,12 @@ libvirt.so.0 libvirt0 #MINVER#
  *@LIBVIRT_5.2.0 5.2.0~rc1
  *@LIBVIRT_5.5.0 5.6.0
  *@LIBVIRT_5.6.0 5.6.0
- *@LIBVIRT_PRIVATE_5.6.0 5.6.0
+ *@LIBVIRT_5.7.0 6.0.0~rc1
+ *@LIBVIRT_5.8.0 6.0.0~rc1
+ *@LIBVIRT_5.9.0 6.0.0~rc1
+ *@LIBVIRT_5.10.0 6.0.0~rc1
+ *@LIBVIRT_6.0.0 6.0.0~rc1
+ *@LIBVIRT_PRIVATE_6.0.0 6.0.0~rc1
 
 libvirt-qemu.so.0 libvirt0 #MINVER#
  *@LIBVIRT_QEMU_0.8.3 0.8.3
@@ -143,4 +148,4 @@ libvirt-admin.so.0 libvirt0 #MINVER#
  *@LIBVIRT_ADMIN_1.3.0 1.2.18
  *@LIBVIRT_ADMIN_2.0.0 2.0.0~rc1
  *@LIBVIRT_ADMIN_3.0.0 3.0.0
- *@LIBVIRT_ADMIN_PRIVATE_5.6.0 5.6.0
+ *@LIBVIRT_ADMIN_PRIVATE_6.0.0 6.0.0~rc1

debian/patches/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch

@@ -18,8 +18,8 @@ require the 'TERM' environment variable to be set to the terminal type.
      virCommandAddEnvPass(cmd, "KRB5CCNAME");
      virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK");
      virCommandAddEnvPass(cmd, "SSH_ASKPASS");
-+    virCommandAddEnvPass(cmd, "GPG_TTY", NULL);
-+    virCommandAddEnvPass(cmd, "TERM", NULL);
++    virCommandAddEnvPass(cmd, "GPG_TTY");
++    virCommandAddEnvPass(cmd, "TERM");
      virCommandAddEnvPass(cmd, "DISPLAY");
      virCommandAddEnvPass(cmd, "XAUTHORITY");
      virCommandClearCaps(cmd);

debian/rules

@@ -18,14 +18,12 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
     WITH_VBOX         = --without-vbox
   endif
   ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64 armhf arm64))
-    MAKE_CHECK        = 1
-    WITH_XEN          = --with-xen
     WITH_LIBXL        = --with-libxl
     XEN_ENABLED       = 1
   else
-    WITH_XEN          = --without-xen
     WITH_LIBXL        = --without-libxl
   endif
+  MAKE_CHECK        = 1
   WITH_STORAGE_LVM    = --with-storage-lvm
   WITH_STORAGE_ISCSI  = --with-storage-iscsi
   WITH_STORAGE_DISK   =	--with-storage-disk
@@ -84,7 +82,6 @@ else
   WITH_APPARMOR       = --without-apparmor
   WITH_NSS_PLUGIN     = --without-nss-plugin
   WITH_DTRACE         = --without-dtrace
-  WITH_XEN            = --without-xen
   WITH_LIBXL          = --without-libxl
   WITH_VBOX           = --without-vbox
 endif
@@ -94,6 +91,7 @@ DEB_CONFIGURE_EXTRA_ARGS :=      \
 	--with-packager="$(DEB_BUILDUSER) $(DEB_BUILDDATE)" \
 	--with-packager-version="$(DEB_RELEASE)" \
 	--with-default-editor="sensible-editor" \
+	--enable-dependency-tracking \
 	--disable-silent-rules   \
 	--disable-rpath          \
 	--with-qemu		 \
@@ -119,13 +117,11 @@ DEB_CONFIGURE_EXTRA_ARGS :=      \
 	$(WITH_SELINUX)          \
 	$(WITH_APPARMOR)         \
 	--with-esx               \
-	--without-phyp           \
 	$(WITH_CAPNG)		 \
 	--enable-debug		 \
 	$(WITH_MACVTAP)		 \
 	$(WITH_NETWORK)		 \
 	$(WITH_NETCF)		 \
-	$(WITH_XEN)		 \
 	$(WITH_LIBXL)		 \
 	$(WITH_VBOX)		 \
 	$(WITH_LXC)              \

debian/salsa-ci.yml

+stages:
+  - build
+  - test
+
+variables:
+  # Default docker image to use
+  LV_DOCKER_IMAGE: debian:unstable
+  LV_WORKING_DIR: $CI_PROJECT_DIR/debian/output
+
+build-debian-package:
+  image: ${LV_DOCKER_IMAGE}
+  stage: build
+  timeout: 3h
+  before_script:
+    - echo "man-db man-db/auto-update boolean false" | debconf-set-selections
+    - export DEBIAN_FRONTEND=noninteractive
+    - apt-get -y update
+    - apt-get -y install build-essential git-buildpackage pristine-tar
+    - apt-get -y build-dep .
+    - rm -f ../* || true
+    - git config user.email 'libvirt@exmple.com'
+    - git config user.name 'Gitlab CI'
+  script:
+    - 'UPSTREAM_BRANCH=$(gbp config dch.upstream-branch)'
+    - git branch "${UPSTREAM_BRANCH}" "origin/${UPSTREAM_BRANCH}"
+    - gbp dch --git-author -S -a --ignore-branch
+    - mkdir -p "${LV_WORKING_DIR}/tarballs"
+    - gbp export-orig --tarball-dir="${LV_WORKING_DIR}/tarballs"
+                      --pristine-tar
+    - git add debian/changelog
+    - gbp buildpackage --git-ignore-new
+                       --git-ignore-branch
+                       --git-export-dir="${LV_WORKING_DIR}/"
+                       --git-export=INDEX
+                       --git-tarball-dir="${LV_WORKING_DIR}/tarballs"
+                        -j -b -uc -us > "${LV_WORKING_DIR}/build.log"
+  artifacts:
+    when: always
+    paths:
+      - "${LV_WORKING_DIR}/build.log"
+      - "${LV_WORKING_DIR}/*.deb"
+      - "${LV_WORKING_DIR}/*.buildinfo"
+      - "${LV_WORKING_DIR}/*.changes"
+
+lint-debian-package:
+  image: ${LV_DOCKER_IMAGE}
+  dependencies:
+    - build-debian-package
+  before_script:
+    - echo "man-db man-db/auto-update boolean false" | debconf-set-selections
+    - export DEBIAN_FRONTEND=noninteractive
+    - apt-get -y update
+    - apt-get -y install lintian
+  script:
+    - ls "${LV_WORKING_DIR}"
+    - lintian ${LV_LINTIAN_OPTS} ${LV_WORKING_DIR}/*.changes