Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-16 20:23:37 (GMT)
committer Jonas Smedegaard <dr@jones.dk>2008-08-16 20:23:37 (GMT)
commit487d4c472e75ba5a326d0d644bc3a3c119ee6940 (patch)
treeee967b8088c40c41ee50baff8ae6da856c8de996
parent3df28d9ff4f6a4c2351b2b8c8293ff735ea56fb1 (diff)
Drop patches 1001 and 2002 no longer relevant.debian/23-1
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/1001_strip_sharedstate_from_MANIFEST.patch17
-rw-r--r--debian/patches/2001_strip_stripped_po-files_from_MANIFEST.patch49
-rw-r--r--debian/patches/series2
4 files changed, 1 insertions, 68 deletions
diff --git a/debian/changelog b/debian/changelog
index 0c1cdb5..2ed151e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
sugar-calculate-activity (23-1) unstable; urgency=low
* New upstream release.
+ * Drop patches 1001 and 2002 no longer relevant.
* Add patch 2002 to use packaged sharedstate (not git-clone it).
* Update cdbs snippets:
+ Use new upstream-tarball.mk to implement get-orig-source target
diff --git a/debian/patches/1001_strip_sharedstate_from_MANIFEST.patch b/debian/patches/1001_strip_sharedstate_from_MANIFEST.patch
deleted file mode 100644
index 2793757..0000000
--- a/debian/patches/1001_strip_sharedstate_from_MANIFEST.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/MANIFEST b/MANIFEST
-index 02d1092..2da902d 100644
---- a/MANIFEST
-+++ b/MANIFEST
-@@ -72,12 +72,3 @@ po/rw.po
- po/te.po
- po/ur.po
- po/yo.po
--sharedstate/__init__.py
--sharedstate/shareddict.py
--sharedstate/sharedobject.py
--sharedstate/sharedobjects.py
--sharedstate/sharedpython.py
--sharedstate/sharedstate.py
--sharedstate/sharedtext.py
--sharedstate/tubeconn.py
--
diff --git a/debian/patches/2001_strip_stripped_po-files_from_MANIFEST.patch b/debian/patches/2001_strip_stripped_po-files_from_MANIFEST.patch
deleted file mode 100644
index 7929d22..0000000
--- a/debian/patches/2001_strip_stripped_po-files_from_MANIFEST.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/MANIFEST b/MANIFEST
-index 02d1092..d1620fa 100644
---- a/MANIFEST
-+++ b/MANIFEST
-@@ -31,44 +31,25 @@ icons/trigonometry-acos.svg
- icons/trigonometry-tanh.svg
- icons/trigonometry-sinh.svg
- icons/trigonometry-cosh.svg
--po/Calculate.pot
- po/POTFILES.in
- po/am.po
- po/ar.po
- po/ay.po
--po/bg.po
--po/bn_IN.po
--po/bn.po
--po/ca.po
--po/de.po
--po/dz.po
--po/el.po
- po/en.po
- po/es.po
--po/fa_AF.po
--po/fa.po
--po/ff.po
- po/fr.po
- po/ha.po
- po/hi.po
- po/ig.po
- po/is.po
--po/ja.po
--po/mk.po
--po/ml.po
--po/mn.po
- po/ne.po
- po/nl.po
--po/pa.po
- po/pl.po
- po/pseudo.po
--po/ps.po
--po/pt_BR.po
- po/pt.po
- po/qu.po
- po/ro.po
- po/ru.po
- po/rw.po
--po/te.po
- po/ur.po
- po/yo.po
diff --git a/debian/patches/series b/debian/patches/series
index 840e350..d69e165 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-1001_strip_sharedstate_from_MANIFEST.patch
1002_fix_class_syntax.patch
1003_danish_l10n.patch
-2001_strip_stripped_po-files_from_MANIFEST.patch
2002_use_packaged_sharedstate.patch