[Pkg-mozext-commits] [gcontactsync] 16/17: Refresh patch

[David Prévot]

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

taffit pushed a commit to branch master
in repository gcontactsync.

commit 23e16586c64ab7b9aa99bd75e408493bf1a9c6d6
Author: David Prévot <taffit at debian.org>
Date:   Sat Nov 1 17:00:57 2014 -0400

    Refresh patch
    
    Git-Dch: Ignore
---
 .../patches/0001-Rename-Thunderbird-to-Icedove.patch | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/patches/0001-Rename-Thunderbird-to-Icedove.patch b/debian/patches/0001-Rename-Thunderbird-to-Icedove.patch
index ae12de4..f2a6126 100644
--- a/debian/patches/0001-Rename-Thunderbird-to-Icedove.patch
+++ b/debian/patches/0001-Rename-Thunderbird-to-Icedove.patch
@@ -24,7 +24,7 @@ Last-Update: 2014-09-18
  13 files changed, 135 insertions(+), 135 deletions(-)
 
 diff --git a/content/Sync.js b/content/Sync.js
-index 1702048..a57b864 100644
+index 8c96ebb..aca198b 100644
 --- a/content/Sync.js
 +++ b/content/Sync.js
 @@ -465,9 +465,9 @@ com.gContactSync.Sync = {
@@ -39,7 +39,7 @@ index 1702048..a57b864 100644
          gContacts   = {};
      // Step 1: get all contacts from Google into GContact objects in an object
      // keyed by ID.
-@@ -544,7 +544,7 @@ com.gContactSync.Sync = {
+@@ -563,7 +563,7 @@ com.gContactSync.Sync = {
          com.gContactSync.LOGGER.LOG(found +
                                      "\n   - Google:      " + gCardDate +
                                      " (" + new Date(gCardDate) + ")" +
@@ -48,7 +48,7 @@ index 1702048..a57b864 100644
                                      " (" + new Date(tbCardDate * 1000) + ")");
          com.gContactSync.LOGGER.VERBOSE_LOG(" * Google ID: " + id);
          // If there is a conflict, looks at the updateGoogleInConflicts
-@@ -570,13 +570,13 @@ com.gContactSync.Sync = {
+@@ -589,13 +589,13 @@ com.gContactSync.Sync = {
          // if the contact from Google is newer update the TB card
          else if (gCardDate > lastSync) {
            com.gContactSync.LOGGER.LOG(" * The contact from Google is newer...Updating the" +
@@ -64,7 +64,7 @@ index 1702048..a57b864 100644
                                        " contact from Google");
            var toUpdate = {};
            toUpdate.gContact = gContact;
-@@ -623,7 +623,7 @@ com.gContactSync.Sync = {
+@@ -642,7 +642,7 @@ com.gContactSync.Sync = {
          com.gContactSync.LOGGER.LOG(gContact.getName() + " - " + gCardDate +
                                      "\n" + id);
          if (gCardDate > lastSync || isNaN(lastSync)) {
@@ -73,7 +73,7 @@ index 1702048..a57b864 100644
            this.mCurrentSummary.mLocal.mAdded++;
            var newCard = ab.newContact();
            com.gContactSync.ContactConverter.makeCard(gContact, newCard);
-@@ -634,7 +634,7 @@ com.gContactSync.Sync = {
+@@ -653,7 +653,7 @@ com.gContactSync.Sync = {
            com.gContactSync.Sync.mContactsToDelete.push(gContact);
          }
          else {
@@ -82,7 +82,7 @@ index 1702048..a57b864 100644
                                         "Ignoring since read-only mode is on.");
            this.mCurrentSummary.mLocal.mIgnored++;
          }
-@@ -679,7 +679,7 @@ com.gContactSync.Sync = {
+@@ -698,7 +698,7 @@ com.gContactSync.Sync = {
    requestDeletePermission: function Sync_requestDeletePermission(aNumTB, aNumGoogle) {
      var warning = com.gContactSync.StringBundle.getStr("confirmDelete1") +
                    " '" + com.gContactSync.Sync.mCurrentAb.getName() + "'" +
@@ -91,7 +91,7 @@ index 1702048..a57b864 100644
                    "\nGoogle: "      + aNumGoogle +
                    "\n" + com.gContactSync.StringBundle.getStr("confirmDelete2");
      com.gContactSync.LOGGER.LOG("Requesting permission to delete " +
-@@ -959,7 +959,7 @@ com.gContactSync.Sync = {
+@@ -978,7 +978,7 @@ com.gContactSync.Sync = {
                      // If write-only is on then ignore the name change
                      if (ab.mPrefs.writeOnly != "true")
                        list.setName(title);
@@ -100,7 +100,7 @@ index 1702048..a57b864 100644
                    }
                    else if (ab.mPrefs.readOnly == "true") {
                      com.gContactSync.LOGGER.LOG(" - The mailing list's name has changed.  " +
-@@ -983,7 +983,7 @@ com.gContactSync.Sync = {
+@@ -1002,7 +1002,7 @@ com.gContactSync.Sync = {
                    // synchronization and reset the AB
                    if (group.isSystemGroup()) {
                      noCatch = true; // don't catch this error
@@ -109,7 +109,7 @@ index 1702048..a57b864 100644
                      var restartStr = com.gContactSync.StringBundle.getStr("pleaseRestart");
                      if (com.gContactSync.confirm(com.gContactSync.StringBundle.getStr("resetConfirm"))) {
                        ab.reset();
-@@ -992,7 +992,7 @@ com.gContactSync.Sync = {
+@@ -1011,7 +1011,7 @@ com.gContactSync.Sync = {
                        com.gContactSync.Preferences.setSyncPref("needRestart", true);
                      }
                      // Throw an error to stop the sync
@@ -118,7 +118,7 @@ index 1702048..a57b864 100644
                    }
                    else {
                      com.gContactSync.Sync.mGroupsToDelete.push(group);
-@@ -1059,7 +1059,7 @@ com.gContactSync.Sync = {
+@@ -1078,7 +1078,7 @@ com.gContactSync.Sync = {
                    com.gContactSync.LOGGER.VERBOSE_LOG(" * Write-only mode was enabled so no action will be taken");
                  }
                  else {

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