[Pkg-mozext-commits] [timeline] 07/08: Refresh patches

David Prévot taffit at alioth.debian.org
Sat Nov 2 14:48:59 UTC 2013 

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository timeline.

commit 461af3d91b51910fb65cb82e252e399bc303d3ce
Author: David Prévot <taffit at debian.org>
Date:   Sat Nov 2 10:07:41 2013 -0400

    Refresh patches
---
 .../patches/0001-Add-iceowl-to-install.rdf.patch   |    6 ++--
 ...2-Remove-not-longer-supported-moz-css-tag.patch |   30 --------------------
 ...initial-state-of-context-menu-checkboxes.patch} |   12 ++++----
 ...ization-and-add-de-DE-as-first-translati.patch} |   10 +++----
 debian/patches/series                              |    5 ++--
 5 files changed, 16 insertions(+), 47 deletions(-)

diff --git a/debian/patches/0001-Add-iceowl-to-install.rdf.patch b/debian/patches/0001-Add-iceowl-to-install.rdf.patch
index 712a5f6..4e8885b 100644
--- a/debian/patches/0001-Add-iceowl-to-install.rdf.patch
+++ b/debian/patches/0001-Add-iceowl-to-install.rdf.patch
@@ -3,15 +3,15 @@ Date: Sun, 14 Apr 2013 01:21:28 +0200
 Subject: Add iceowl to install.rdf
 
 ---
- install.rdf |   10 ++++++++++
+ install.rdf | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 diff --git a/install.rdf b/install.rdf
-index c03f144..bd3fe7a 100755
+index 601e670..7db3ba5 100755
 --- a/install.rdf
 +++ b/install.rdf
 @@ -20,6 +20,16 @@
-             <em:maxVersion>19.*</em:maxVersion>
+             <em:maxVersion>24.*</em:maxVersion>
          </Description>
      </em:targetApplication>
 +
diff --git a/debian/patches/0002-Remove-not-longer-supported-moz-css-tag.patch b/debian/patches/0002-Remove-not-longer-supported-moz-css-tag.patch
deleted file mode 100644
index a110b7b..0000000
--- a/debian/patches/0002-Remove-not-longer-supported-moz-css-tag.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Matthias Schmitz <matthias at sigxcpu.org>
-Date: Sun, 14 Apr 2013 01:34:00 +0200
-Subject: Remove not longer supported -moz- css tag
-
----
- chrome/skin/timeline.css |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/skin/timeline.css b/chrome/skin/timeline.css
-index 57860e8..fa71354 100755
---- a/chrome/skin/timeline.css
-+++ b/chrome/skin/timeline.css
-@@ -25,7 +25,7 @@
- }
- 
- .standardEvent {
--	-moz-border-radius:5px;
-+	border-radius:5px;
- 	border:#000 solid 2px; 
- 	z-index:2;  	
- 	line-height:0.8;
-@@ -43,7 +43,7 @@
- }
- 
- .allDayEvent {
--	-moz-border-radius:2px;
-+	border-radius:2px;
- 	z-index:1;  	
- 	height:4px;
- 	top:16px;
diff --git a/debian/patches/0003-Set-initial-state-of-context-menu-checkboxes.patch b/debian/patches/0002-Set-initial-state-of-context-menu-checkboxes.patch
similarity index 90%
rename from debian/patches/0003-Set-initial-state-of-context-menu-checkboxes.patch
rename to debian/patches/0002-Set-initial-state-of-context-menu-checkboxes.patch
index a4fdd26..1795f84 100644
--- a/debian/patches/0003-Set-initial-state-of-context-menu-checkboxes.patch
+++ b/debian/patches/0002-Set-initial-state-of-context-menu-checkboxes.patch
@@ -3,15 +3,15 @@ Date: Fri, 19 Apr 2013 22:31:01 +0200
 Subject: Set initial state of context menu checkboxes
 
 ---
- chrome/content/timeline.js  |   16 ++++++++++++++++
- chrome/content/timeline.xul |   11 +++++++----
+ chrome/content/timeline.js  | 16 ++++++++++++++++
+ chrome/content/timeline.xul | 11 +++++++----
  2 files changed, 23 insertions(+), 4 deletions(-)
 
 diff --git a/chrome/content/timeline.js b/chrome/content/timeline.js
-index 1f408d0..0f62154 100755
+index cca2437..7b7f669 100755
 --- a/chrome/content/timeline.js
 +++ b/chrome/content/timeline.js
-@@ -365,4 +365,20 @@ calendarTimeline.zoom = function zoom(delta) {
+@@ -364,4 +364,20 @@ calendarTimeline.zoom = function zoom(delta) {
      this.draw();
  }
  
@@ -33,11 +33,11 @@ index 1f408d0..0f62154 100755
 +
  timer.initWithCallback(callback, 28125, Components.interfaces.nsITimer.TYPE_REPEATING_SLACK);
 diff --git a/chrome/content/timeline.xul b/chrome/content/timeline.xul
-index ca54d6a..cf3224e 100755
+index f2da246..c2c8c95 100755
 --- a/chrome/content/timeline.xul
 +++ b/chrome/content/timeline.xul
 @@ -18,14 +18,17 @@
-         <stack id="eventsDiv"/>
+         <stack id="eventsDiv"/>
      </stack>
          
 -    <menupopup id="timelineContext">
diff --git a/debian/patches/0004-Enable-localization-and-add-de-DE-as-first-translati.patch b/debian/patches/0003-Enable-localization-and-add-de-DE-as-first-translati.patch
similarity index 95%
rename from debian/patches/0004-Enable-localization-and-add-de-DE-as-first-translati.patch
rename to debian/patches/0003-Enable-localization-and-add-de-DE-as-first-translati.patch
index 3dcd002..c048294 100644
--- a/debian/patches/0004-Enable-localization-and-add-de-DE-as-first-translati.patch
+++ b/debian/patches/0003-Enable-localization-and-add-de-DE-as-first-translati.patch
@@ -3,10 +3,10 @@ Date: Fri, 19 Apr 2013 23:42:12 +0200
 Subject: Enable localization and add de-DE as first translation
 
 ---
- chrome.manifest                 |    1 +
- chrome/content/timeline.xul     |   16 +++++++++-------
- chrome/locale/de-DE/overlay.dtd |    6 ++++++
- chrome/locale/en-US/overlay.dtd |    7 ++++++-
+ chrome.manifest                 |  1 +
+ chrome/content/timeline.xul     | 16 +++++++++-------
+ chrome/locale/de-DE/overlay.dtd |  6 ++++++
+ chrome/locale/en-US/overlay.dtd |  7 ++++++-
  4 files changed, 22 insertions(+), 8 deletions(-)
  create mode 100755 chrome/locale/de-DE/overlay.dtd
 
@@ -22,7 +22,7 @@ index 1cfa942..22a6258 100755
  
  skin    calendartimeline    classic/1.0 chrome/skin/
 diff --git a/chrome/content/timeline.xul b/chrome/content/timeline.xul
-index cf3224e..0bde3bf 100755
+index c2c8c95..b46d2ef 100755
 --- a/chrome/content/timeline.xul
 +++ b/chrome/content/timeline.xul
 @@ -1,7 +1,9 @@
diff --git a/debian/patches/series b/debian/patches/series
index ea51f6e..b45b9f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Add-iceowl-to-install.rdf.patch
-0002-Remove-not-longer-supported-moz-css-tag.patch
-0003-Set-initial-state-of-context-menu-checkboxes.patch
-0004-Enable-localization-and-add-de-DE-as-first-translati.patch
+0002-Set-initial-state-of-context-menu-checkboxes.patch
+0003-Enable-localization-and-add-de-DE-as-first-translati.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/timeline.git

More information about the Pkg-mozext-commits mailing list