Add Ubuntu build support

.travis.yml

@@ -4,13 +4,13 @@ sudo: true
 matrix:
   include:
     - os: osx
-      env: TARGET=x86_64-apple-darwin RID=osx-x64 RUN_TESTS=yes CROSS=no
+      env: TARGET=x86_64-apple-darwin RID=osx-x64 RUN_TESTS=yes CROSS=no CREATE_DEB=no
     - os: linux
-      env: TARGET=x86_64-linux-gnu RID=linux-x64 RUN_TESTS=yes CROSS=no
+      env: TARGET=x86_64-linux-gnu RID=linux-x64 RUN_TESTS=yes CROSS=no CREATE_DEB=yes
     - os: linux
-      env: TARGET=arm-linux-gnueabihf RID=linux-arm RUN_TESTS=no CROSS=yes ARCH=armhf
+      env: TARGET=arm-linux-gnueabihf RID=linux-arm RUN_TESTS=no CROSS=yes ARCH=armhf CREATE_DEB=no
     - os: linux
-      env: TARGET=aarch64-linux-gnu RID=linux-arm64 RUN_TESTS=no CROSS=yes ARCH=arm64
+      env: TARGET=aarch64-linux-gnu RID=linux-arm64 RUN_TESTS=no CROSS=yes ARCH=arm64 CREATE_DEB=no
 
 language: c
 
@@ -22,6 +22,7 @@ env:
 
 before_install:
 - test -n $CC && unset CC
+- if [ "$CREATE_DEB" = "yes" ]; then sudo apt-get install -y devscripts debhelper dh-autoreconf dput; fi
 - if [ "$CROSS" = "yes" ]; then sudo apt-get install -y gcc-$TARGET binutils-$TARGET g++-$TARGET; fi
 - if [ "$CROSS" = "yes" ]; then sudo rm -rf /etc/apt/sources.list.d; fi
 - if [ "$CROSS" = "yes" ]; then sudo echo "deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu trusty main universe" | sudo tee /etc/apt/sources.list > /dev/null; fi
@@ -66,6 +67,7 @@ after_success:
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then az=$HOME/Library/Python/2.7/bin/az; fi
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then az=$HOME/.local/bin/az; fi
 - $az storage blob upload -f libimobiledevice-$RID.tar.gz -c imobiledevice -n libimobiledevice-$RID-1.2.1-$TRAVIS_BUILD_NUMBER.tar.gz
+- if [[ "$CREATE_DEB" == "yes" ]]; then ./make-deb.sh xenial; fi
 
 after_failure:
 - cat config.log

debian/control

@@ -6,21 +6,15 @@ XSBC-Original-Maintainer: gtkpod Maintainers <pkg-gtkpod-devel@lists.alioth.debi
 Uploaders: Julien Lavergne <julien.lavergne@gmail.com>
 Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 9),
-               dh-python,
-               libgnutls28-dev,
-               libgcrypt20-dev,
+               libssl-dev,
                libusb-1.0-0-dev (>= 1.0.3) [linux-any],
                libglib2.0-dev (>= 2.14.1),
                libplist-dev (>= 1.11),
                libplist++-dev (>= 1.11),
-               python-all-dev (>= 2.6.6-3~),
-               cython (>= 0.17.0),
                libusbmuxd-dev (>= 1.0.9),
                libtasn1-6-dev (>= 1.1),
                libreadline-dev,
-               python-plist (>= 1.8-2~),
                dh-autoreconf
-X-Python-Version: >= 2.3
 Homepage: http://libimobiledevice.org/
 Vcs-Git: git://git.debian.org/git/pkg-gtkpod/packages/libimobiledevice.git
 Vcs-Browser: http://git.debian.org/?p=pkg-gtkpod/packages/libimobiledevice.git
@@ -50,8 +44,7 @@ Depends: libimobiledevice6 (= ${binary:Version}),
          libglib2.0-dev,
          libplist-dev,
          libusbmuxd-dev,
-         libgnutls28-dev,
-         libgcrypt20-dev,
+         libssl-dev,
          libtasn1-6-dev
 Description: Library for communicating with iPhone and iPod Touch devices
  libimobiledevice is a library that talks the native Apple USB protocols that
@@ -79,22 +72,6 @@ Description: Library for communicating with iPhone and iPod Touch devices
  .
  This package contains the debugging symbols.
 
-Package: python-imobiledevice
-Section: python
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${python:Depends}
-Provides: ${python:Provides}
-Conflicts: python-libiphone, python-iphone
-Replaces: python-libiphone, python-iphone
-Description: Library for communicating with iPhone and iPod Touch devices
- libimobiledevice is a library that talks the native Apple USB protocols that
- the iPhone and iPod Touch use. Unlike other projects, libimobiledevice does
- not depend on using any existing libraries from Apple.
- .
- This package contains the Python bindings
-
 Package: libimobiledevice-utils
 Architecture: any
 Section: utils
@@ -106,14 +83,3 @@ Description: Library for communicating with iPhone and iPod Touch devices
  not depend on using any existing libraries from Apple.
  .
  This package contains utilities and examples which use libimobiledevice.
-
-Package: libimobiledevice-doc
-Architecture: all
-Section: doc
-Depends: libjs-jquery, ${misc:Depends}
-Description: Library for communicating with iPhone and iPod Touch devices
- libimobiledevice is a library that talks the native Apple USB protocols that
- the iPhone and iPod Touch use. Unlike other projects, libimobiledevice does
- not depend on using any existing libraries from Apple.
- .
- This package contains the documentation for the library.

debian/libimobiledevice6.symbols

@@ -24,6 +24,7 @@ libimobiledevice.so.6 libimobiledevice6 #MINVER#
  afc_rename_path@Base 0.9.7
  afc_set_file_time@Base 0.9.7
  afc_truncate@Base 0.9.7
+ debug_info_real@Base 1.2.1.97-0xenial
  debugserver_client_free@Base 1.1.7
  debugserver_client_new@Base 1.1.7
  debugserver_client_receive@Base 1.1.7
@@ -70,6 +71,7 @@ libimobiledevice.so.6 libimobiledevice6 #MINVER#
  idevice_connect@Base 0.9.7
  idevice_connection_disable_ssl@Base 0.9.7
  idevice_connection_enable_ssl@Base 0.9.7
+ idevice_connection_get_fd@Base 1.2.1.97-0xenial
  idevice_connection_receive@Base 0.9.7
  idevice_connection_receive_timeout@Base 0.9.7
  idevice_connection_send@Base 0.9.7
@@ -82,6 +84,7 @@ libimobiledevice.so.6 libimobiledevice6 #MINVER#
  idevice_get_handle@Base 0.9.7
  idevice_get_udid@Base 1.1.4
  idevice_new@Base 0.9.7
+ idevice_set_debug_callback@Base 1.2.1.97-0xenial
  idevice_set_debug_level@Base 0.9.7
  instproxy_archive@Base 0.9.7
  instproxy_browse@Base 0.9.7
@@ -121,6 +124,7 @@ libimobiledevice.so.6 libimobiledevice6 #MINVER#
  lockdownd_get_value@Base 0.9.7
  lockdownd_goodbye@Base 0.9.7
  lockdownd_pair@Base 0.9.7
+ lockdownd_pair_with_options@Base 1.2.1.97-0xenial
  lockdownd_query_type@Base 0.9.7
  lockdownd_receive@Base 0.9.7
  lockdownd_remove_value@Base 0.9.7
@@ -137,6 +141,7 @@ libimobiledevice.so.6 libimobiledevice6 #MINVER#
  misagent_client_new@Base 1.1.5
  misagent_client_start_service@Base 1.1.6
  misagent_copy@Base 1.1.5
+ misagent_copy_all@Base 1.2.1.97-0xenial
  misagent_get_status_code@Base 1.1.5
  misagent_install@Base 1.1.5
  misagent_remove@Base 1.1.5
@@ -197,6 +202,8 @@ libimobiledevice.so.6 libimobiledevice6 #MINVER#
  np_observe_notifications@Base 0.9.7
  np_post_notification@Base 0.9.7
  np_set_notify_callback@Base 0.9.7
+ pinvoke_free_string@Base 1.2.1.97-0xenial
+ pinvoke_get_string_length@Base 1.2.1.97-0xenial
  property_list_service_client_free@Base 1.1.7
  property_list_service_client_new@Base 1.1.7
  property_list_service_disable_ssl@Base 1.1.7
@@ -225,6 +232,7 @@ libimobiledevice.so.6 libimobiledevice6 #MINVER#
  sbservices_get_interface_orientation@Base 1.1.4
  sbservices_set_icon_state@Base 0.9.7
  screenshotr_client_free@Base 1.0.0
+ screenshotr_screenshot_free@Base 1.2.1.97-0xenial
  screenshotr_client_new@Base 1.0.0
  screenshotr_client_start_service@Base 1.1.6
  screenshotr_take_screenshot@Base 1.0.0

debian/rules

@@ -6,7 +6,7 @@ configure_flags += \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-dev-tools \
-		--disable-openssl \
+                --without-cython \
 		--disable-silent-rules
 
 %:

gpg-pass.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+PWD_FILE="$1"
+shift 1
+
+export GPG_TTY=`tty`
+. /etc/lsb-release
+echo Running on $DISTRIB_CODENAME
+
+if [ "$DISTRIB_CODENAME" = "trusty" ]; then
+    cat $PWD_FILE | gpg2 --batch --passphrase-fd 0 --yes $@
+else
+    cat $PWD_FILE | gpg2 --batch --passphrase-fd 0 --pinentry-mode loopback --yes $@
+fi

make-deb.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+export DEBEMAIL="frederik.carlier@quamotion.mobi"
+export DEBFULLNAME="Frederik Carlier"
+
+git config --global user.name "$DEBFULLNAME"
+git config --global user.email "$DEBEMAIL"
+
+dch -v "1.2.1.$TRAVIS_BUILD_NUMBER-0$1" --distribution $1 "Travis CI Build"
+git add debian/changelog
+git commit -m "Travis CI Build"
+
+git clean -xfd
+
+git archive --format tar.gz -o ../libimobiledevice_1.2.1.${TRAVIS_BUILD_NUMBER}.orig.tar.gz HEAD
+
+echo allow-loopback-pinentry > ~/.gnupg/gpg-agent.conf
+gpg --allow-secret-key-import --import ppa.asc
+killall gpg-agent
+echo "${GPG_PASSPHRASE}" >> /tmp/gpg_passphrase
+debuild -S -kFBA0ACB4 -p"$DIR/gpg-pass.sh /tmp/gpg_passphrase"
+rm -rf /tmp/gpg_passphrase
+
+dput ppa:quamotion/ppa ../libimobiledevice_1.2.1.${TRAVIS_BUILD_NUMBER}-0$1_source.changes
+

ppa.asc

@@ -0,0 +1,60 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+Version: GnuPG v2
+
+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
+ZO8=
+=BJDM
+-----END PGP PRIVATE KEY BLOCK-----