Drop patch 1004, fixed upstream.

3 files changed, 1 insertions, 123 deletions

diff --git a/debian/changelog b/debian/changelog
index 92e5a81..a058cf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ sugar-calculate-activity (25-1) UNRELEASED; urgency=low
   * Update copyright-check (no new owners or copyrights).
   * Revert standards version to 3.7.3 (README.source needed to comply
     with 3.8.0).
+  * Drop patch 1004, fixed upstream.
 
  -- Jonas Smedegaard <dr@jones.dk>  Wed, 03 Dec 2008 15:40:46 +0100
 
diff --git a/debian/patches/1004_fix_ne_l10n.patch b/debian/patches/1004_fix_ne_l10n.patch
deleted file mode 100644
index 6b6ba85..0000000
--- a/debian/patches/1004_fix_ne_l10n.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-#  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 384883f..d69e165 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 1002_fix_class_syntax.patch
 1003_danish_l10n.patch
 2002_use_packaged_sharedstate.patch
-1004_fix_ne_l10n.patch