Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2008-12-03 12:32:41 (GMT)
committer Holger Levsen <holger@layer-acht.org>2008-12-03 12:32:41 (GMT)
commit96b4e7fb356813eae1b35a8a2df5a534c16f02c4 (patch)
tree9badeb402f5fad594c8363ff26a26eac3b90c25a
parent7ce3c39d36323f7438c0bab333a48622092a9ba8 (diff)
Add patch 1004 to fix po/ne.po, else it FTBFS.debian/23-2
-rw-r--r--debian/cdbs/1/class/python-sugar.mk2
-rw-r--r--debian/changelog3
-rw-r--r--debian/control.in5
-rw-r--r--debian/patches/1004_fix_ne_l10n.patch122
-rw-r--r--debian/patches/series1
5 files changed, 129 insertions, 4 deletions
diff --git a/debian/cdbs/1/class/python-sugar.mk b/debian/cdbs/1/class/python-sugar.mk
index c67a865..1a97b2f 100644
--- a/debian/cdbs/1/class/python-sugar.mk
+++ b/debian/cdbs/1/class/python-sugar.mk
@@ -63,7 +63,7 @@ $(patsubst %,build/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: build/%:
$(patsubst %,install/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: install/%:
mkdir -p $(DEB_DESTDIR)usr/share/sugar/activities
for pythonver in $(cdbs_python_build_versions); do \
- /usr/bin/python$$ver $(cdbs_pkgsrcdir)/setup.py install $(DEB_DESTDIR)usr/share/sugar/activities; \
+ /usr/bin/python$$ver $(cdbs_pkgsrcdir)/setup.py install --prefix=$(DEB_DESTDIR)usr/share/sugar/activities; \
done
$(patsubst %,binary-install/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: binary-install/%:
diff --git a/debian/changelog b/debian/changelog
index 980b589..1179a8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-sugar-calculate-activity (23-2) UNRELEASED; urgency=low
+sugar-calculate-activity (23-2) unstable; urgency=low
[ Jonas Smedegaard ]
* Depend on ${misc:Depends}.
@@ -9,6 +9,7 @@ sugar-calculate-activity (23-2) UNRELEASED; urgency=low
[ Holger Levsen ]
* Bump standards version to 3.8.0, no changes needed.
* Add myself to uploaders.
+ * Add patch 1004 to fix po/ne.po, else it FTBFS.
-- Jonas Smedegaard <dr@jones.dk> Tue, 07 Oct 2008 11:58:04 +0200
diff --git a/debian/control.in b/debian/control.in
index 26d9696..c8d0243 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,9 +2,10 @@ Source: sugar-calculate-activity
Section: x11
Priority: optional
Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
-Uploaders: Jonas Smedegaard <dr@jones.dk>
+Uploaders: Jonas Smedegaard <dr@jones.dk>,
+ Holger Levsen <holger@debian.org>
Build-Depends: @cdbs@
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Vcs-Git: git://git.debian.org/git/collab-maint/sugar-calculate-activity.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-calculate-activity.git;a=summary
Homepage: http://wiki.laptop.org/go/Sugar
diff --git a/debian/patches/1004_fix_ne_l10n.patch b/debian/patches/1004_fix_ne_l10n.patch
new file mode 100644
index 0000000..6b6ba85
--- /dev/null
+++ b/debian/patches/1004_fix_ne_l10n.patch
@@ -0,0 +1,122 @@
+# make msgfmt happy, else there are several errors
+# "`msgid' and `msgstr' entries do not both begin with '\n'"
+# and the build fails
+# reported upstream on #sugar
+#
+# Holger Levsen, 2008-12-03
+Index: sugar-calculate-activity/po/ne.po
+===================================================================
+--- sugar-calculate-activity.orig/po/ne.po 2008-12-03 12:22:21.000000000 +0000
++++ sugar-calculate-activity/po/ne.po 2008-12-03 12:23:37.000000000 +0000
+@@ -148,7 +148,6 @@
+ "acos(x), return the arc cosine of x. This is the angle for which the cosine "
+ "is x. Defined for -1 <= x < 1"
+ msgstr ""
+-"\n"
+ "acos(x), return the arc cosine of x. This is the angle for which the cosine "
+ "is x. Defined for -1 <= x < 1"
+
+@@ -160,7 +159,6 @@
+ msgid ""
+ "and(x, y), logical and. Returns True if x and y are True, else returns False"
+ msgstr ""
+-"\n"
+ "and(x, y), logical and. Returns True if x and y are True, else returns False"
+
+ #: eqnparserhelp.py:46
+@@ -172,7 +170,6 @@
+ "asin(x), return the arc sine of x. This is the angle for which the sine is "
+ "x. Defined for -1 <= x <= 1"
+ msgstr ""
+-"\n"
+ "asin(x), return the arc sine of x. This is the angle for which the sine is "
+ "x. Defined for -1 <= x <= 1"
+
+@@ -185,7 +182,6 @@
+ "atan(x), return the arc tangent of x. This is the angle for which the "
+ "tangent is x. Defined for all x"
+ msgstr ""
+-"\n"
+ "atan(x), return the arc tangent of x. This is the angle for which the "
+ "tangent is x. Defined for all x"
+
+@@ -198,7 +194,6 @@
+ "cos(x), return the cosine of x. This is the x-coordinate on the unit circle "
+ "at the angle x"
+ msgstr ""
+-"\n"
+ "cos(x), return the cosine of x. This is the x-coordinate on the unit circle "
+ "at the angle x"
+
+@@ -210,7 +205,6 @@
+ msgid ""
+ "cosh(x), return the hyperbolic cosine of x. Given by (exp(x) + exp(-x)) / 2"
+ msgstr ""
+-"\n"
+ "cosh(x), return the hyperbolic cosine of x. Given by (exp(x) + exp(-x)) / 2"
+
+ #: eqnparserhelp.py:61
+@@ -247,7 +241,6 @@
+ "ln(x), return the natural logarithm of x. This is the value for which the "
+ "exponent exp() equals x. Defined for x >= 0."
+ msgstr ""
+-"\n"
+ "ln(x), return the natural logarithm of x. This is the value for which the "
+ "exponent exp() equals x. Defined for x >= 0."
+
+@@ -268,7 +261,6 @@
+ msgid ""
+ "or(x, y), logical or. Returns True if x and/or y are True, else return False"
+ msgstr ""
+-"\n"
+ "or(x, y), logical or. Returns True if x and/or y are True, else return False"
+
+ #: eqnparserhelp.py:82
+@@ -280,7 +272,6 @@
+ "plot(eqn, var=-a..b), plot the equation 'eqn' with the variable 'var' in the "
+ "range from a to b"
+ msgstr ""
+-"\n"
+ "plot(eqn, var=-a..b), plot the equation 'eqn' with the variable 'var' in the "
+ "range from a to b"
+
+@@ -293,7 +284,6 @@
+ "sin(x), return the sine of x. This is the y-coordinate on the unit circle at "
+ "the angle x"
+ msgstr ""
+-"\n"
+ "sin(x), return the sine of x. This is the y-coordinate on the unit circle at "
+ "the angle x"
+
+@@ -305,7 +295,6 @@
+ msgid ""
+ "sinh(x), return the hyperbolic sine of x. Given by (exp(x) - exp(-x)) / 2"
+ msgstr ""
+-"\n"
+ "sinh(x), return the hyperbolic sine of x. Given by (exp(x) - exp(-x)) / 2"
+
+ #: eqnparserhelp.py:93
+@@ -317,7 +306,6 @@
+ "sqrt(x), return the square root of x. This is the value for which the square "
+ "equals x. Defined for x >= 0."
+ msgstr ""
+-"\n"
+ "sqrt(x), return the square root of x. This is the value for which the square "
+ "equals x. Defined for x >= 0."
+
+@@ -339,7 +327,6 @@
+ "origin of the unit circle to the point on the unit circle defined by the "
+ "angle x. Given by sin(x) / cos(x)"
+ msgstr ""
+-"\n"
+ "tan(x), return the tangent of x. This is the slope of the line from the "
+ "origin of the unit circle to the point on the unit circle defined by the "
+ "angle x. Given by sin(x) / cos(x)"
+@@ -379,7 +366,6 @@
+ "xor(x, y), logical xor. Returns True if either x is True (and y is False) or "
+ "y is True (and x is False), else returns False"
+ msgstr ""
+-"\n"
+ "xor(x, y), logical xor. Returns True if either x is True (and y is False) or "
+ "y is True (and x is False), else returns False"
+
diff --git a/debian/patches/series b/debian/patches/series
index d69e165..384883f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
1002_fix_class_syntax.patch
1003_danish_l10n.patch
2002_use_packaged_sharedstate.patch
+1004_fix_ne_l10n.patch