Merge lp:~ubuntu-branches/ubuntu/raring/libimobiledevice/raring-201301191442 into lp:ubuntu/raring/libimobiledevice

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/raring/libimobiledevice reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/raring/libimobiledevice/raring-201301191442. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

22. By Iain Lane on 2012-12-18

Look in python MA path. Import q-updates version to r.

* debian/patches/fix-ma-includes: Look in MA path for python includes.
* FIXME: Still FTBFS due to cython changes
  (http://libiphone.lighthouseapp.com/projects/27916/tickets/285-cant-compile-cython-bindings)

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-19 06:11:28 +0000
+++ debian/changelog	2013-01-19 14:51:20 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 libimobiledevice (1.1.4-1ubuntu5) raring; urgency=low
 
   * 08_cython_0.16_fix.patch: Follow-up cython fix from Michael Bienia:
@@ -21,6 +22,23 @@
 
  -- Sebastien Bacher <[e-mail]>  Wed, 24 Oct 2012 12:01:08 +0200
 
+=======
+libimobiledevice (1.1.4-1ubuntu3) UNRELEASED; urgency=low
+
+  * debian/patches/fix-ma-includes: Look in MA path for python includes.
+  * FIXME: Still FTBFS due to cython changes
+    (http://libiphone.lighthouseapp.com/projects/27916/tickets/285-cant-compile-cython-bindings)
+
+ -- Iain Lane <[e-mail]>  Tue, 18 Dec 2012 16:23:01 +0000
+
+libimobiledevice (1.1.4-1ubuntu3) quantal-proposed; urgency=low
+
+  * git_utf8_devices_names.patch:
+    - fix incorrect naming of e.g iphone devices (lp: #1049991)
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 24 Oct 2012 12:01:08 +0200
+
+>>>>>>> MERGE-SOURCE
 libimobiledevice (1.1.4-1ubuntu2) quantal; urgency=low
 
   * debian/patches/git_handle_unset_environment.patch:

=== added file 'debian/patches/fix-ma-includes'
--- debian/patches/fix-ma-includes	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-ma-includes	2013-01-19 14:51:20 +0000
@@ -0,0 +1,20 @@
+Description: python puts some stuff into multiarch paths; look there
+Forwarded: no
+Author: Iain Lane <[e-mail]>
+
+Index: b/m4/ac_python_devel.m4
+===================================================================
+--- a/m4/ac_python_devel.m4
++++ b/m4/ac_python_devel.m4
+@@ -154,8 +154,10 @@
+ 	if test -z "$PYTHON_CPPFLAGS"; then
+ 		python_path=`$PYTHON -c "import distutils.sysconfig; \
+            		print distutils.sysconfig.get_python_inc();"`
++		python_platpath=`$PYTHON -c "import distutils.sysconfig; \
++				print distutils.sysconfig.get_python_inc(plat_specific=True);"`
+ 		if test -n "${python_path}"; then
+-		   	python_path="-I$python_path"
++		   	python_path="-I$python_path -I$python_platpath"
+ 		fi
+ 		PYTHON_CPPFLAGS=$python_path
+ 	fi

=== added file 'debian/patches/git_utf8_devices_names.patch'
--- debian/patches/git_utf8_devices_names.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_utf8_devices_names.patch	2013-01-19 14:51:20 +0000
@@ -0,0 +1,23 @@
+From 060e3f2683ed2b0b08e1a31deb9608a99e193b4a Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau
+Date: Mon, 25 Jun 2012 22:03:30 +0000
+Subject: property_list_service: do not strip non-ASCII characters from XML plists
+
+'content' is declared as char content[] so if char is signed, all characters with the high bit set will be negative so they will be < 0x20. This means the code will strip all non-ASCII (multi-byte) UTF-8 characters and replace them with spaces. This commit fixes it now by really only considering ASCII characters.
+---
+diff --git a/src/property_list_service.c b/src/property_list_service.c
+index 8634864..c9a8edf 100644
+--- a/src/property_list_service.c
++++ b/src/property_list_service.c
+@@ -250,7 +250,7 @@ static property_list_service_error_t internal_plist_receive_timeout(property_lis
+ 			} else {
+ 				/* iOS 4.3+ hack: plist data might contain invalid characters, thus we convert those to spaces */
+ 				for (bytes = 0; bytes < pktlen-1; bytes++) {
+-					if ((content[bytes] < 0x20) && (content[bytes] != 0x09) && (content[bytes] != 0x0a) && (content[bytes] != 0x0d))
++					if ((content[bytes] >= 0) && (content[bytes] < 0x20) && (content[bytes] != 0x09) && (content[bytes] != 0x0a) && (content[bytes] != 0x0d))
+ 						content[bytes] = 0x20;
+ 				}
+ 				plist_from_xml(content, pktlen, plist);
+--
+cgit v0.9.0.2
+

=== renamed file 'debian/patches/git_utf8_devices_names.patch' => 'debian/patches/git_utf8_devices_names.patch.moved'
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-01-19 06:11:28 +0000
+++ debian/patches/series	2013-01-19 14:51:20 +0000
@@ -5,4 +5,9 @@
 08_cython_0.16_fix.patch
 09_use_python_config.patch
 git_handle_unset_environment.patch
-git_utf8_devices_names.patch
+<<<<<<< TREE
+git_utf8_devices_names.patch
+=======
+git_utf8_devices_names.patch
+fix-ma-includes
+>>>>>>> MERGE-SOURCE

=== modified file 'm4/ac_python_devel.m4'
--- m4/ac_python_devel.m4	2013-01-19 06:11:28 +0000
+++ m4/ac_python_devel.m4	2013-01-19 14:51:20 +0000
@@ -152,7 +152,18 @@
 	#
 	AC_MSG_CHECKING([for Python include path])
 	if test -z "$PYTHON_CPPFLAGS"; then
+<<<<<<< TREE
 		PYTHON_CPPFLAGS=`$PYTHON-config --includes`
+=======
+		python_path=`$PYTHON -c "import distutils.sysconfig; \
+           		print distutils.sysconfig.get_python_inc();"`
+		python_platpath=`$PYTHON -c "import distutils.sysconfig; \
+				print distutils.sysconfig.get_python_inc(plat_specific=True);"`
+		if test -n "${python_path}"; then
+		   	python_path="-I$python_path -I$python_platpath"
+		fi
+		PYTHON_CPPFLAGS=$python_path
+>>>>>>> MERGE-SOURCE
 	fi
 	AC_MSG_RESULT([$PYTHON_CPPFLAGS])
 	AC_SUBST([PYTHON_CPPFLAGS])