diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-05-07 14:19:01 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-05-07 14:19:01 (GMT) |
| commit | f8d2aaec23a5d1f7a1f83c5078ff4b654c9bc164 (patch) | |
| tree | 71c7e3d8eed408c8f9f845eb11d8a9f6dbd0dab9 | |
| parent | a750cfa6cbd3e9d17469c165051e568a830323d2 (diff) | |
Drop stripping rpath (causes "No module named xpcom.server" error).debian/0.4.0.git.20071211-3
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index 1265642..8c81d5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sugar-hulahop (0.4.0~git.20071211-3) experimental; urgency=low + + * Drop stripping rpath (causes "No module named xpcom.server" error). + + -- Jonas Smedegaard <dr@jones.dk> Wed, 07 May 2008 16:16:06 +0200 + sugar-hulahop (0.4.0~git.20071211-2) experimental; urgency=low * Tighten python-xpcom dependency to match build-dependency. diff --git a/debian/control b/debian/control index 221b9a7..d754a0b 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org> Uploaders: Jonas Smedegaard <dr@jones.dk> -Build-Depends: autotools-dev, devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 5), dh-buildinfo, xulrunner-dev (>= 1.9~b5-4~), python-xpcom (>= 1.9~b5-4~), python-gtk2-dev, chrpath +Build-Depends: autotools-dev, devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 5), dh-buildinfo, xulrunner-dev (>= 1.9~b5-4~), python-xpcom (>= 1.9~b5-4~), python-gtk2-dev Standards-Version: 3.7.3 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-hulahop.git Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-hulahop.git;a=summary diff --git a/debian/rules b/debian/rules index b7ba291..7e0735e 100755 --- a/debian/rules +++ b/debian/rules @@ -39,10 +39,6 @@ autoreconf:: post-patches:: chmod a+x py-compile -# Strip hardcoded rpath -binary-strip/$(pkg):: - find $(DEB_DESTDIR)/usr/lib -type f -name '*.so' -exec chrpath -d '{}' ';' - ifneq (,$(findstring init,$(DEB_BUILD_OPTIONS))) DEB_PHONY_RULES += autogen autogen: autoreconf debian/stamp-autotools-files clean @@ -62,9 +58,6 @@ CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e 's/\bautomak # Needed by upstream build process CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), xulrunner-dev (>= 1.9~b5-4~), python-xpcom (>= 1.9~b5-4~), python-gtk2-dev -# Needed for our packaging -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), chrpath - # Merge duplicate build-dependencies CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.27-1)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//') |