diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-04-08 01:20:58 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-04-08 01:21:40 (GMT) |
| commit | 30ff4d66021f7af3ec53dc79a0dfb07f4f7d0a9e (patch) | |
| tree | c74ae32ee76dec6fe8af7730f57c15428594ebd2 | |
| parent | d4593df5a32c7ef259dce8d944083c00a8390243 (diff) | |
Use chrpath to remove hardcoded rpath.debian/0.79.2-1
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index cd1c4c4..0ee4c2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,8 @@ sugar-toolkit (0.79.2-1) unstable; urgency=low Highlights: + Add default to label arg in palette constructor, for API backwards compatibility - * Drop no longer needed patch 2991 to apply reconfigured autotools - files. + * Drop patch 2991 to apply reconfigured autotools files, and instead + use (and build-depend on) chrpath to remove hardcoded rpath. * Recommend unzip, needed for bundlebuilder (activity packaging). * Update local cdbs snippets: + Newline-delimit found files in copyright-check. Update diff --git a/debian/control b/debian/control index 847ddae..505efc8 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: cdbs (>= 0.4.39), autotools-dev, quilt, patchutils (>= 0.2.25), devscripts (>= 2.10.7), python-all-dev (>= 2.3.5-11), python-central (>= 0.6), debhelper (>= 5), dh-buildinfo, libglib2.0-dev, python-gtk2-dev, gettext, intltool, libxml-parser-perl +Build-Depends: cdbs (>= 0.4.39), autotools-dev, quilt, patchutils (>= 0.2.25), devscripts (>= 2.10.7), python-all-dev (>= 2.3.5-11), python-central (>= 0.6), debhelper (>= 5), dh-buildinfo, libglib2.0-dev, python-gtk2-dev, gettext, intltool, libxml-parser-perl, chrpath Standards-Version: 3.7.3 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-toolkit.git Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-toolkit.git;a=summary diff --git a/debian/rules b/debian/rules index cc3720d..eeea1de 100755 --- a/debian/rules +++ b/debian/rules @@ -22,8 +22,15 @@ DEB_UPSTREAM_TARBALL_MD5 = c9e3a6910f775bfde0d30ba4191dcf08 binary-post-install/$(pkg):: rmdir --ignore-fail-on-non-empty --parents $(DEB_DESTDIR)/usr/share/locale +# Drop created dir if empty to please lintian +binary-strip/$(pkg):: + find $(DEB_DESTDIR)/usr/lib -type f -name '*.so' -exec chrpath -d '{}' ';' + # Needed by upstream build process CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libglib2.0-dev, python-gtk2-dev, gettext, intltool, libxml-parser-perl +# 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.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27-1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//') |