Merge pull request #175 from libimobiledevice-win32/features/ubuntu-2…

…0.10 Build for Ubuntu 20.10
libimobiledevice-win32 · Dec 11, 2020 · 396477a · 396477a
2 parents b8eb22f + 287f7d0
commit 396477a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 20 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -203,12 +203,12 @@ stages:
         bionic:
           DIST: bionic
           imageName: ubuntu:18.04
-        eoan:
-          DIST: eoan
-          imageName: ubuntu:19.10
         focal:
           DIST: focal
           imageName: ubuntu:20.04
+        groovy:
+          DIST: groovy
+          imageName: ubuntu:20.10
     pool:
       vmImage: 'ubuntu-16.04'
     container:
@@ -311,10 +311,10 @@ stages:
           DIST: xenial
         bionic:
           DIST: bionic
-        eoan:
-          DIST: eoan
         focal:
           DIST: focal
+        groovy:
+          DIST: groovy
     pool:
       vmImage: 'ubuntu-16.04'
     steps:

diff --git a/deb/libimobiledevice/debian/control b/deb/libimobiledevice/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9),
                libusbmuxd-dev (>= 1.0.9),
                libtasn1-3-dev (>= 1.1) | libtasn1-6-dev (>= 1.1),
                libreadline-dev,
-               python-all-dev (>= 2.6.6-3~),
+               python3-all-dev (>= 2.6.6-3~),
                dh-autoreconf
 Homepage: http://libimobiledevice.org/
 Vcs-Git: git://git.debian.org/git/pkg-gtkpod/packages/libimobiledevice.git

diff --git a/deb/libimobiledevice/debian/rules b/deb/libimobiledevice/debian/rules
@@ -11,7 +11,7 @@ configure_flags += \
                 --enable-debug-code
 
 %:
-	dh $@ --with=python2,autoreconf
+	dh $@ --with=python3,autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- 	$(configure_flags)
@@ -31,10 +31,6 @@ override_dh_install:
 override_dh_strip:
 	dh_strip --dbg-package=libimobiledevice6-dbg
 
-override_dh_python2:
-	# Only build for the current version of python, not all supported.
-	dh_python2 --no-guessing-versions
-
 override_dh_makeshlibs:
 	dh_makeshlibs -- -c4
 

diff --git a/deb/libplist/debian/control b/deb/libplist/debian/control
@@ -7,11 +7,10 @@ Build-Depends: debhelper (>= 9.20120115~),
                dpkg-dev (>= 1.16.1),
                dh-autoreconf,
                pkg-config,
-               cython,
-               python-all-dev (>= 2.6.6-3~),
+               cython3,
+               python3-all-dev (>= 2.6.6-3~),
                doxygen,
                chrpath
-X-Python-Version: >= 2.5
 Homepage: http://www.libimobiledevice.org/
 Vcs-Git: git://git.debian.org/git/pkg-gtkpod/packages/libplist.git -b debian
 Vcs-Browser: http://git.debian.org/?p=pkg-gtkpod/packages/libplist.git

diff --git a/deb/libplist/debian/rules b/deb/libplist/debian/rules
@@ -8,7 +8,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 PYVER=$(shell pyversions -vd)
 
 %:
-	dh $@ --with python2,autoreconf
+	dh $@ --with python3,autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- PYTHON_VERSION=$(PYVER) --without-cython
@@ -37,10 +37,6 @@ override_dh_link:
 	dh_link
 	dh_link -p libplist-utils /usr/share/man/man1/$(manpage_name).gz /usr/share/man/man1/plistutil.1.gz
 
-override_dh_python2:
-	# Only build for the current version of python, not all supported.
-	dh_python2 --no-guessing-versions
-
 override_dh_strip:
 	dh_strip --dbgsym-migration='libplist-dbg (<< 2.0.0-4~)'
 

diff --git a/steps/create-deb.yml b/steps/create-deb.yml
@@ -10,7 +10,8 @@ steps:
 - script: |
     sudo apt-get update
     sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libusb-1.0-0-dev libreadline-dev libcurl4-openssl-dev libssl-dev pkg-config libjs-jquery libglib2.0-dev libtasn1-6-dev udev systemd libxml2-dev
-    sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libxml2-utils devscripts debhelper dh-autoreconf dput cython python-all-dev doxygen chrpath
+    sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libxml2-utils devscripts debhelper dh-autoreconf dput doxygen chrpath
+    sudo DEBIAN_FRONTEND=noninteractive apt-get install -y cython3 python3-all-dev dh-python
     sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libzip-dev
   displayName: 'Install dependencies'
 - script: |