Package: protobuf
Version: 2.3.0-4
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch
In Ubuntu, we've applied the attached patch to achieve the following:
* Merge from debian unstable. Remaining changes:
- Don't use #!/usr/bin/python2.4 but use #!/usr/bin/python instead
We thought you might be interested in doing the same.
Cheers,
Michael
-- System Information:
Debian Release: squeeze/sid
APT prefers maverick-updates
APT policy: (500, 'maverick-updates'), (500, 'maverick-security'), (500,
'maverick')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.35-22-generic (SMP w/4 CPU cores)
Locale: LANG=en_DK.utf8, LC_CTYPE=en_DK.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru protobuf-2.3.0/debian/patches/default_python_version protobuf-2.3.0/debian/patches/default_python_version
--- protobuf-2.3.0/debian/patches/default_python_version 1970-01-01 01:00:00.000000000 +0100
+++ protobuf-2.3.0/debian/patches/default_python_version 2010-06-08 23:32:22.000000000 +0200
@@ -0,0 +1,20 @@
+Index: protobuf-2.1.0/python/mox.py
+===================================================================
+--- protobuf-2.1.0.orig/python/mox.py 2009-11-17 03:37:29.000000000 +1100
++++ protobuf-2.1.0/python/mox.py 2009-11-17 03:38:08.000000000 +1100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.4
++#!/usr/bin/python
+ #
+ # Copyright 2008 Google Inc.
+ #
+Index: protobuf-2.1.0/python/stubout.py
+===================================================================
+--- protobuf-2.1.0.orig/python/stubout.py 2009-11-17 03:37:29.000000000 +1100
++++ protobuf-2.1.0/python/stubout.py 2009-11-17 03:38:17.000000000 +1100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.4
++#!/usr/bin/python
+ #
+ # Copyright 2008 Google Inc.
+ #
diff -Nru protobuf-2.3.0/debian/patches/series protobuf-2.3.0/debian/patches/series
--- protobuf-2.3.0/debian/patches/series 2010-08-18 22:57:16.000000000 +0200
+++ protobuf-2.3.0/debian/patches/series 2010-10-15 10:01:59.000000000 +0200
@@ -1,3 +1,4 @@
# comment to keep empty file in the diff.gz
+default_python_version
disable-setuptools-download.diff
arm_optimization.diff
