summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog13
-rwxr-xr-xsetup.py2
2 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 94b5f37e..d6db7f70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+python-apt (0.7.10.3ubuntu2) UNRELEASED; urgency=critical
+
+ [ Loic Minier ]
+ * Merge changes below from Michael Casadevall.
+
+ [ Michael Casadevall ]
+ * setup.py:
+ - Added gcc and gcc_s to work around gcc-4.4 issue on ARM and libstdc++
+ - This is a temporary workaround for Karmic Alpha 1. See bug #375334
+ for more details
+
+ -- Michael Casadevall <mcasadevall@blacksteel> Tue, 12 May 2009 05:53:07 -0400
+
python-apt (0.7.10.3ubuntu1) karmic; urgency=low
* merged from debian, remaining changes:
diff --git a/setup.py b/setup.py
index 9ed21378..4683554c 100755
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ from DistUtilsExtra.command import build_extra, build_i18n
# The apt_pkg module
files = map(lambda source: "python/"+source,
parse_makefile("python/makefile")["APT_PKG_SRC"].split())
-apt_pkg = Extension("apt_pkg", files, libraries=["apt-pkg"])
+apt_pkg = Extension("apt_pkg", files, libraries=["apt-pkg", "gcc", "gcc_s"])
# The apt_inst module
files = map(lambda source: "python/"+source,