diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-12-03 20:12:44 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-12-03 20:41:32 (GMT) |
| commit | c5e14c1fcc5e515493e1cc0731fdef6b57d8d504 (patch) | |
| tree | 1a056a802cc672abb42db84b7f2752cbb44d3ed5 | |
| parent | 4f1c61bf2d4d9c188dd0956893e61d0d3ddb6b16 (diff) | |
Dynamically update locale entries in MANIFEST.
| -rw-r--r-- | debian/cdbs/1/class/python-sugar.mk | 9 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/debian/cdbs/1/class/python-sugar.mk b/debian/cdbs/1/class/python-sugar.mk index dd10d38..166db9e 100644 --- a/debian/cdbs/1/class/python-sugar.mk +++ b/debian/cdbs/1/class/python-sugar.mk @@ -56,9 +56,14 @@ pre-build:: mkdir -p debian/stamps-configure $(patsubst %,build/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: build/%: + [ ! -e $(cdbs_pkgsrcdir)/MANIFEST ] || [ -e $(cdbs_pkgsrcdir)/MANIFEST.upstream ] || mv $(cdbs_pkgsrcdir)/MANIFEST $(cdbs_pkgsrcdir)/MANIFEST.upstream + egrep -v '^locale/.*/(.*\.mo|activity\.linfo)$$' $(cdbs_pkgsrcdir)/MANIFEST.upstream > $(cdbs_pkgsrcdir)/MANIFEST for pythonver in $(cdbs_python_build_versions); do \ /usr/bin/python$$ver $(cdbs_pkgsrcdir)/setup.py build; \ done + -IFS="`printf '\n'`" find "$(cdbs_pkgsrcdir)/locale" -type f \( -name '*.mo' -or -name 'activity.linfo' \) | while read path; do \ + echo "$$path" | sed 's!^$(cdbs_pkgsrcdir)/!!' >> $(cdbs_pkgsrcdir)/MANIFEST; \ + done $(patsubst %,install/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: install/%: mkdir -p $(DEB_DESTDIR)usr/share/sugar/activities @@ -73,6 +78,10 @@ else dh_pycentral -p$(cdbs_curpkg) endif +reverse-config:: $(patsubst %,cleanpythonsugar-reverse-config/%,$(DEB_PYTHON_SUGAR_PACKAGES)) +$(patsubst %,cleanpythonsugar-reverse-config/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: cleanpythonsugar-reverse-config/% : + [ ! -e $(cdbs_pkgsrcdir)/MANIFEST.upstream ] || mv -f $(cdbs_pkgsrcdir)/MANIFEST.upstream $(cdbs_pkgsrcdir)/MANIFEST + clean:: $(patsubst %,cleanpythonsugar/%,$(DEB_PYTHON_SUGAR_PACKAGES)) ifeq (, $(cdbs_selected_pycompat)) echo "$(cdbs_pycompat)" >debian/pycompat diff --git a/debian/changelog b/debian/changelog index 2e2e63e..3f64ada 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ sugar-calculate-activity (25-2) unstable; urgency=low * Update local CDBS snippets: + Really install into right path. Closes: 485233. + Fix install Sugar activitites by their non-localized name. + + Dynamically update locale entries in MANIFEST. * Semi-auto-update debian/control to tighten build-dependencies. -- Jonas Smedegaard <dr@jones.dk> Wed, 03 Dec 2008 20:24:18 +0100 |