[jabref] 02/08: fresh 001_koppor_debian patch and rename to remove 3.8.1

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository jabref.

commit c0dbe0b9759bb129fe1aff36fcf305a783862fd5
Author: tony mancill <tmancill at debian.org>
Date:   Mon Feb 6 21:13:54 2017 -0800

    fresh 001_koppor_debian patch and rename to remove 3.8.1
---
 ..._debian_3.8.1.patch => 001_koppor_debian.patch} | 30 ++++++++++++----------
 debian/patches/series                              |  2 +-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/debian/patches/001_koppor_debian_3.8.1.patch b/debian/patches/001_koppor_debian.patch
similarity index 99%
rename from debian/patches/001_koppor_debian_3.8.1.patch
rename to debian/patches/001_koppor_debian.patch
index 6b7f785..ae1ac79 100644
--- a/debian/patches/001_koppor_debian_3.8.1.patch
+++ b/debian/patches/001_koppor_debian.patch
@@ -35,8 +35,8 @@ Forwarded: not-needed
 -    compile 'com.github.lgooddatepicker:LGoodDatePicker:8.3.0'
 -
      testCompile 'junit:junit:4.12'
-     testCompile 'org.mockito:mockito-core:2.3.0'
-     testCompile 'com.github.tomakehurst:wiremock:2.4.1'
+     testCompile 'org.mockito:mockito-core:2.6.2'
+     testCompile 'com.github.tomakehurst:wiremock:2.5.0'
 --- a/external-libraries.txt
 +++ b/external-libraries.txt
 @@ -22,11 +22,6 @@
@@ -186,7 +186,7 @@ Forwarded: not-needed
      // To contain instantiated entry editors. This is to save time
      // As most enums, this must not be null
      private BasePanelMode mode = BasePanelMode.SHOWING_NOTHING;
-@@ -220,8 +215,6 @@
+@@ -221,8 +216,6 @@
          this.frame = frame;
          this.tableModel = new MainTableDataModel(getBibDatabaseContext());
  
@@ -195,7 +195,7 @@ Forwarded: not-needed
          setupMainPanel();
  
          setupActions();
-@@ -493,12 +486,6 @@
+@@ -494,12 +487,6 @@
          // The action for copying the BibTeX key and the title for the first selected entry
          actions.put(Actions.COPY_KEY_AND_TITLE, (BaseAction) () -> copyKeyAndTitle());
  
@@ -208,7 +208,7 @@ Forwarded: not-needed
          // The action for copying the BibTeX keys as hyperlinks to the urls of the selected entries
          actions.put(Actions.COPY_KEY_AND_LINK, new CopyBibTeXKeyAndLinkAction(mainTable));
  
-@@ -705,14 +692,6 @@
+@@ -706,14 +693,6 @@
          actions.put(Actions.DOWNLOAD_FULL_TEXT, new FindFullTextAction(this));
      }
  
@@ -223,8 +223,8 @@ Forwarded: not-needed
      private void copy() {
          List<BibEntry> bes = mainTable.getSelectedEntries();
  
-@@ -2413,10 +2392,6 @@
-         this.currentSearchQuery = currentSearchQuery;
+@@ -2418,10 +2397,6 @@
+         this.currentSearchQuery = Optional.ofNullable(currentSearchQuery);
      }
  
 -    public CitationStyleCache getCitationStyleCache() {
@@ -451,16 +451,18 @@ Forwarded: not-needed
          }
          // Set focus to editor component after changing its text:
          editor.getTextComponent().requestFocus();
-@@ -73,19 +59,4 @@
-         //return datePicker;
+@@ -74,23 +60,4 @@
          return panel;
      }
--
+ 
 -    /**
 -     * Used to set the calender popup to the currently used Date
 -     * @param dateString
 -     */
 -    public void updateDatePickerDate(String dateString) {
+-        // unregister DateChangeListener before update to prevent circular calls resulting in IllegalStateExceptions
+-        datePicker.removeDateChangeListener(this);
+-
 -        if(dateString!=null && !dateString.isEmpty()) {
 -            try {
 -                datePicker.setDate(LocalDate.parse(dateString, dateTimeFormatter));
@@ -469,6 +471,8 @@ Forwarded: not-needed
 -                        + "Clear button in calender popup will not work.");
 -            }
 -        }
+-
+-        datePicker.addDateChangeListener(this);
 -    }
  }
 --- a/src/main/java/net/sf/jabref/gui/entryeditor/EntryEditor.java
@@ -2231,10 +2235,10 @@ Forwarded: not-needed
 +++ b/src/main/resources/l10n/Menu_ru.properties
 @@ -135,5 +135,3 @@
  View_change_log=Просмотр_журнала_изменений
- Copy_BibTeX_key_and_link=
- Copy_DOI_url=
+ Copy_BibTeX_key_and_link=Копировать_ключ_BibTeX_и_ссылку
+ Copy_DOI_url=Копировать_URL-адрес_DOI
 -
--Copy_citation=
+-Copy_citation=Копировать_цитату
 --- a/src/main/resources/l10n/Menu_sv.properties
 +++ b/src/main/resources/l10n/Menu_sv.properties
 @@ -135,5 +135,3 @@
diff --git a/debian/patches/series b/debian/patches/series
index 561834e..f1fd951 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-001_koppor_debian_3.8.1.patch
+001_koppor_debian.patch
 010_gradle_build.patch
 020_disable_automatic_upgrade_check.patch
 030_xjc.patch

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