[Pkg-cli-apps-commits] [keepass2] 03/04: New upstream release

Julian Taylor jtaylor.debian at googlemail.com
Tue Jan 10 16:49:57 UTC 2017 

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

jtaylor-guest pushed a commit to branch master
in repository keepass2.

commit 62ed8bcfda640b40e20972da4b331834c6e39ad8
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Tue Jan 10 15:49:04 2017 +0100

    New upstream release
---
 debian/changelog                                   |  6 +++
 debian/control                                     |  2 +-
 debian/copyright                                   |  2 +-
 debian/patches/disable-autoupdate-dialog.patch     |  2 +-
 debian/patches/do-not-use-the-non-free-icons.patch | 22 +++++++--
 debian/patches/fix-XSL-search-path.patch           |  8 ++--
 debian/patches/force_toolsversion_4                |  4 +-
 debian/patches/skip-sgen-run-during-build.patch    |  2 +-
 debian/patches/use-installed-ico-files.patch       | 52 ++++++++++++++--------
 9 files changed, 68 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7864ef0..0e2e10c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+keepass2 (2.35+dfsg-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Tue, 10 Jan 2017 15:48:32 +0100
+
 keepass2 (2.34+dfsg-1) unstable; urgency=medium
 
   * New upstream release (Closes: #827676)
diff --git a/debian/control b/debian/control
index 6c86bcf..dd0508d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: archmage,
                mono-devel (>= 2.6.7),
                mono-xbuild,
                python
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Homepage: http://keepass.info/
 Vcs-Git: https://anonscm.debian.org/git/pkg-cli-apps/packages/keepass2.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-cli-apps/packages/keepass2.git
diff --git a/debian/copyright b/debian/copyright
index f1c1664..ae2bb52 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: KeePass2
 Upstream-Contact: Dominik Reichl <dominik.reichl at t-online.de>
 Source: http://keepass.info/ repackaged to remove icon files obtained from other password managers with non dfsg free licenses, listing in debian/README.source
-Files-Excluded: KeePass/Resources/Images/B16x16_Imp_PwDepot.png KeePass/Resources/Images/B16x16_Imp_TurboPws.png KeePass/Resources/Images/B16x16_Imp_PassKeeper.png KeePass/Resources/Images/B16x16_Imp_HandySafePro.png KeePass/Resources/Images/B16x16_Imp_LastPass.png KeePass/Resources/Images/B16x16_Imp_PINs.png KeePass/Resources/Images/B16x16_Imp_DataVault.png KeePass/Resources/Images/B16x16_Imp_Whisper32.png KeePass/Resources/Images/B16x16_Imp_AmP.png KeePass/Resources/Images/B16x16_Imp_N [...]
+Files-Excluded: KeePass/Resources/Images/B16x16_Imp_Enpass.png KeePass/Resources/Images/B16x16_Imp_MSecure.png KeePass/Resources/Images/B16x16_Imp_PwSaver.png KeePass/Resources/Images/B16x16_Imp_PwDepot.png KeePass/Resources/Images/B16x16_Imp_TurboPws.png KeePass/Resources/Images/B16x16_Imp_PassKeeper.png KeePass/Resources/Images/B16x16_Imp_HandySafePro.png KeePass/Resources/Images/B16x16_Imp_LastPass.png KeePass/Resources/Images/B16x16_Imp_PINs.png KeePass/Resources/Images/B16x16_Imp_Da [...]
 
 Files: *
 Copyright: 2003-2012 Dominik Reichl
diff --git a/debian/patches/disable-autoupdate-dialog.patch b/debian/patches/disable-autoupdate-dialog.patch
index 7d958a1..9dc8086 100644
--- a/debian/patches/disable-autoupdate-dialog.patch
+++ b/debian/patches/disable-autoupdate-dialog.patch
@@ -12,7 +12,7 @@ Index: keepass2/KeePass/App/Configuration/AceApplication.cs
 ===================================================================
 --- keepass2.orig/KeePass/App/Configuration/AceApplication.cs
 +++ keepass2/KeePass/App/Configuration/AceApplication.cs
-@@ -309,8 +309,8 @@ namespace KeePass.App.Configuration
+@@ -317,8 +317,8 @@ namespace KeePass.App.Configuration
  			set { m_bCheckForUpdate = value; }
  		}
  
diff --git a/debian/patches/do-not-use-the-non-free-icons.patch b/debian/patches/do-not-use-the-non-free-icons.patch
index 2f4d5ce..00e287c 100644
--- a/debian/patches/do-not-use-the-non-free-icons.patch
+++ b/debian/patches/do-not-use-the-non-free-icons.patch
@@ -4,8 +4,8 @@ Subject: do not use the non-free icons
 
 Forwarded: not-needed
 ---
- KeePass/Properties/Resources.resx | 72 +++++++++++++++++++--------------------
- 1 file changed, 36 insertions(+), 36 deletions(-)
+ KeePass/Properties/Resources.resx | 80 +++++++++++++++++++--------------------
+ 1 file changed, 40 insertions(+), 40 deletions(-)
 
 Index: keepass2/KeePass/Properties/Resources.resx
 ===================================================================
@@ -197,7 +197,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
    </data>
    <data name="B16x16_MenuCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
      <value>..\Resources\Images\B16x16_MenuCheck.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -629,7 +629,7 @@
+@@ -629,18 +629,18 @@
      <value>..\Resources\Nuvola_Derived\B16x16_Folder_New_Ex.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    </data>
    <data name="B16x16_Imp_NPassword" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -206,3 +206,19 @@ Index: keepass2/KeePass/Properties/Resources.resx
    </data>
    <data name="B16x16_Folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
      <value>..\Resources\Nuvola\B16x16_Folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+   </data>
+   <data name="B16x16_Imp_PwSaver" type="System.Resources.ResXFileRef, System.Windows.Forms">
+-    <value>..\Resources\Images\B16x16_Imp_PwSaver.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
++    <value>..\Resources\Nuvola\B16x16_KGPG_Import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+   </data>
+   <data name="B16x16_Imp_MSecure" type="System.Resources.ResXFileRef, System.Windows.Forms">
+-    <value>..\Resources\Images\B16x16_Imp_MSecure.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
++    <value>..\Resources\Nuvola\B16x16_KGPG_Import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+   </data>
+   <data name="B16x16_Imp_Enpass" type="System.Resources.ResXFileRef, System.Windows.Forms">
+-    <value>..\Resources\Images\B16x16_Imp_Enpass.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
++    <value>..\Resources\Nuvola\B16x16_KGPG_Import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+   </data>
+-</root>
+\ No newline at end of file
++</root>
diff --git a/debian/patches/fix-XSL-search-path.patch b/debian/patches/fix-XSL-search-path.patch
index 8fb0158..1727636 100644
--- a/debian/patches/fix-XSL-search-path.patch
+++ b/debian/patches/fix-XSL-search-path.patch
@@ -21,13 +21,13 @@ Index: keepass2/KeePass/App/AppDefs.cs
 +                public const string DebianDataDir = "/usr/share/keepass2/";
 +
  		public const string XslFilesDir = "XSL";
- 		public const string XslFileHtmlLite = "KDBX_DetailsLite.xsl";
- 		public const string XslFileHtmlFull = "KDBX_DetailsFull.xsl";
+ 		public const string XslFileHtmlFull = "KDBX_DetailsFull_HTML.xsl";
+ 		public const string XslFileHtmlLight = "KDBX_DetailsLight_HTML.xsl";
 Index: keepass2/KeePass/Forms/AboutForm.cs
 ===================================================================
 --- keepass2.orig/KeePass/Forms/AboutForm.cs
 +++ keepass2/KeePass/Forms/AboutForm.cs
-@@ -86,8 +86,7 @@ namespace KeePass.Forms
+@@ -97,8 +97,7 @@ namespace KeePass.Forms
  			m_lvComponents.Items.Add(lvi);
  
  			lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);
@@ -36,4 +36,4 @@ Index: keepass2/KeePass/Forms/AboutForm.cs
 +			string strPath = AppDefs.DebianDataDir;
  			strPath += AppDefs.XslFilesDir;
  			strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
- 			bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlLite);
+ 			bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlFull);
diff --git a/debian/patches/force_toolsversion_4 b/debian/patches/force_toolsversion_4
index 4107ba1..a81c7e9 100644
--- a/debian/patches/force_toolsversion_4
+++ b/debian/patches/force_toolsversion_4
@@ -30,7 +30,7 @@ Index: keepass2/KeePass/KeePass.csproj
    <PropertyGroup>
      <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
      <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -1335,4 +1335,4 @@
+@@ -1392,4 +1392,4 @@
    <Target Name="AfterBuild">
    </Target>
    -->
@@ -47,7 +47,7 @@ Index: keepass2/KeePassLib/KeePassLib.csproj
    <PropertyGroup>
      <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
      <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -147,4 +147,4 @@
+@@ -161,4 +161,4 @@
    <Target Name="AfterBuild">
    </Target>
    -->
diff --git a/debian/patches/skip-sgen-run-during-build.patch b/debian/patches/skip-sgen-run-during-build.patch
index 74a4a6a..026394d 100644
--- a/debian/patches/skip-sgen-run-during-build.patch
+++ b/debian/patches/skip-sgen-run-during-build.patch
@@ -11,7 +11,7 @@ Index: keepass2/KeePass/KeePass.csproj
 ===================================================================
 --- keepass2.orig/KeePass/KeePass.csproj
 +++ keepass2/KeePass/KeePass.csproj
-@@ -1335,7 +1335,4 @@
+@@ -1392,7 +1392,4 @@
    <Target Name="AfterBuild">
    </Target>
    -->
diff --git a/debian/patches/use-installed-ico-files.patch b/debian/patches/use-installed-ico-files.patch
index 3281949..c75d925 100644
--- a/debian/patches/use-installed-ico-files.patch
+++ b/debian/patches/use-installed-ico-files.patch
@@ -29,6 +29,7 @@ Forwarded: not-needed
  KeePass/Forms/EntryListForm.cs          |  2 +-
  KeePass/Forms/EntryReportForm.cs        |  2 +-
  KeePass/Forms/ExchangeDataForm.cs       |  2 +-
+ KeePass/Forms/FieldPickerForm.cs        |  2 +-
  KeePass/Forms/FieldRefForm.cs           |  2 +-
  KeePass/Forms/FileBrowserForm.cs        |  2 +-
  KeePass/Forms/GroupForm.cs              |  2 +-
@@ -56,15 +57,15 @@ Forwarded: not-needed
  KeePass/Forms/UrlOverrideForm.cs        |  2 +-
  KeePass/Forms/UrlOverridesForm.cs       |  2 +-
  KeePass/Forms/XmlReplaceForm.cs         |  2 +-
- 48 files changed, 56 insertions(+), 56 deletions(-)
+ 49 files changed, 57 insertions(+), 57 deletions(-)
 
 Index: keepass2/KeePass/Forms/AboutForm.cs
 ===================================================================
 --- keepass2.orig/KeePass/Forms/AboutForm.cs
 +++ keepass2/KeePass/Forms/AboutForm.cs
-@@ -57,11 +57,11 @@ namespace KeePass.Forms
- 			string strDesc = KPRes.Version + " " + PwDefs.VersionString;
- 			if(Program.IsDevelopmentSnapshot()) strDesc += " (Dev)";
+@@ -68,11 +68,11 @@ namespace KeePass.Forms
+ 				strDesc += ")";
+ 			}
  
 -			Icon icoNew = new Icon(Properties.Resources.KeePass, 48, 48);
 +			Icon icoNew = new Icon(new Icon("/usr/share/keepass2/KeePass.ico"), 48, 48);
@@ -93,7 +94,7 @@ Index: keepass2/KeePass/Forms/CharPickerForm.cs
 ===================================================================
 --- keepass2.orig/KeePass/Forms/CharPickerForm.cs
 +++ keepass2/KeePass/Forms/CharPickerForm.cs
-@@ -134,7 +134,7 @@ namespace KeePass.Forms
+@@ -135,7 +135,7 @@ namespace KeePass.Forms
  
  			m_fontChars = FontUtil.CreateFont("Tahoma", 8.25f, FontStyle.Bold);
  
@@ -132,7 +133,7 @@ Index: keepass2/KeePass/Forms/DataEditorForm.cs
 ===================================================================
 --- keepass2.orig/KeePass/Forms/DataEditorForm.cs
 +++ keepass2/KeePass/Forms/DataEditorForm.cs
-@@ -93,7 +93,7 @@ namespace KeePass.Forms
+@@ -95,7 +95,7 @@ namespace KeePass.Forms
  
  			GlobalWindowManager.AddWindow(this);
  
@@ -158,7 +159,7 @@ Index: keepass2/KeePass/Forms/DatabaseOperationsForm.cs
 ===================================================================
 --- keepass2.orig/KeePass/Forms/DatabaseOperationsForm.cs
 +++ keepass2/KeePass/Forms/DatabaseOperationsForm.cs
-@@ -61,7 +61,7 @@ namespace KeePass.Forms
+@@ -64,7 +64,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_Package_Settings, KPRes.DatabaseMaintenance,
  				KPRes.DatabaseMaintenanceDesc);
@@ -171,7 +172,7 @@ Index: keepass2/KeePass/Forms/DatabaseSettingsForm.cs
 ===================================================================
 --- keepass2.orig/KeePass/Forms/DatabaseSettingsForm.cs
 +++ keepass2/KeePass/Forms/DatabaseSettingsForm.cs
-@@ -81,7 +81,7 @@ namespace KeePass.Forms
+@@ -90,7 +90,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_Ark, KPRes.DatabaseSettings,
  				KPRes.DatabaseSettingsDesc);
@@ -288,7 +289,7 @@ Index: keepass2/KeePass/Forms/EntropyForm.cs
 ===================================================================
 --- keepass2.orig/KeePass/Forms/EntropyForm.cs
 +++ keepass2/KeePass/Forms/EntropyForm.cs
-@@ -78,7 +78,7 @@ namespace KeePass.Forms
+@@ -77,7 +77,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_Binary, KPRes.EntropyTitle,
  				KPRes.EntropyDesc);
@@ -336,6 +337,19 @@ Index: keepass2/KeePass/Forms/ExchangeDataForm.cs
  
  			this.Text = strWndTitle;
  
+Index: keepass2/KeePass/Forms/FieldPickerForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/FieldPickerForm.cs
++++ keepass2/KeePass/Forms/FieldPickerForm.cs
+@@ -93,7 +93,7 @@ namespace KeePass.Forms
+ 			if(strTitle.Length > 0) strTitleEx += " - ";
+ 			strTitleEx += PwDefs.ShortProductName;
+ 
+-			this.Icon = Properties.Resources.KeePass;
++			this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+ 			this.Text = strTitleEx;
+ 
+ 			BannerFactory.CreateBannerEx(this, m_bannerImage,
 Index: keepass2/KeePass/Forms/FieldRefForm.cs
 ===================================================================
 --- keepass2.orig/KeePass/Forms/FieldRefForm.cs
@@ -366,7 +380,7 @@ Index: keepass2/KeePass/Forms/GroupForm.cs
 ===================================================================
 --- keepass2.orig/KeePass/Forms/GroupForm.cs
 +++ keepass2/KeePass/Forms/GroupForm.cs
-@@ -78,7 +78,7 @@ namespace KeePass.Forms
+@@ -80,7 +80,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_Folder_Txt, strTitle,
  				(m_bCreatingNew ? KPRes.AddGroupDesc : KPRes.EditGroupDesc));
@@ -457,7 +471,7 @@ Index: keepass2/KeePass/Forms/KeyPromptForm.cs
 ===================================================================
 --- keepass2.orig/KeePass/Forms/KeyPromptForm.cs
 +++ keepass2/KeePass/Forms/KeyPromptForm.cs
-@@ -120,7 +120,7 @@ namespace KeePass.Forms
+@@ -121,7 +121,7 @@ namespace KeePass.Forms
  			string strBannerDesc = WinUtil.CompactPath(m_ioInfo.Path, 45);
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_KGPG_Key2, strBannerTitle, strBannerDesc);
@@ -496,7 +510,7 @@ Index: keepass2/KeePass/Forms/MainForm_Functions.cs
 ===================================================================
 --- keepass2.orig/KeePass/Forms/MainForm_Functions.cs
 +++ keepass2/KeePass/Forms/MainForm_Functions.cs
-@@ -435,18 +435,18 @@ namespace KeePass.Forms
+@@ -438,18 +438,18 @@ namespace KeePass.Forms
  				strNtfText = strNtfPre + strFileDesc;
  
  				Icon icoDisposable, icoAssignable;
@@ -518,7 +532,7 @@ Index: keepass2/KeePass/Forms/MainForm_Functions.cs
  					ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
  				m_ntfTray.Icon = icoAssignable;
  				if(icoDisposable != null) icoDisposable.Dispose();
-@@ -469,7 +469,7 @@ namespace KeePass.Forms
+@@ -472,7 +472,7 @@ namespace KeePass.Forms
  					m_docMgr.ActiveDatabase.IOConnectionInfo.Path, 63 - strNtfPre.Length);
  
  				Icon icoDisposable, icoAssignable;
@@ -527,7 +541,7 @@ Index: keepass2/KeePass/Forms/MainForm_Functions.cs
  					ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
  				m_ntfTray.Icon = icoAssignable;
  				if(icoDisposable != null) icoDisposable.Dispose();
-@@ -494,7 +494,7 @@ namespace KeePass.Forms
+@@ -497,7 +497,7 @@ namespace KeePass.Forms
  			m_ntfTray.Text = StrUtil.CompactString3Dots(strNtfText, 63);
  
  			Icon icoToDispose, icoToAssign;
@@ -536,7 +550,7 @@ Index: keepass2/KeePass/Forms/MainForm_Functions.cs
  				ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
  				this.Icon = icoToAssign;
  			if(icoToDispose != null) icoToDispose.Dispose();
-@@ -2730,12 +2730,12 @@ namespace KeePass.Forms
+@@ -2771,12 +2771,12 @@ namespace KeePass.Forms
  			}
  			else if(m.Msg == DwmUtil.WM_DWMSENDICONICTHUMBNAIL)
  			{
@@ -551,7 +565,7 @@ Index: keepass2/KeePass/Forms/MainForm_Functions.cs
  				return;
  			}
  
-@@ -3844,7 +3844,7 @@ namespace KeePass.Forms
+@@ -3900,7 +3900,7 @@ namespace KeePass.Forms
  					// wasn't fully constructed at that time yet)
  					// if(IsFileLocked(null))
  					//	TaskbarList.SetOverlayIcon(this,
@@ -564,7 +578,7 @@ Index: keepass2/KeePass/Forms/OptionsForm.cs
 ===================================================================
 --- keepass2.orig/KeePass/Forms/OptionsForm.cs
 +++ keepass2/KeePass/Forms/OptionsForm.cs
-@@ -119,7 +119,7 @@ namespace KeePass.Forms
+@@ -121,7 +121,7 @@ namespace KeePass.Forms
  
  			GlobalWindowManager.AddWindow(this);
  
@@ -616,7 +630,7 @@ Index: keepass2/KeePass/Forms/PwEntryForm.cs
 ===================================================================
 --- keepass2.orig/KeePass/Forms/PwEntryForm.cs
 +++ keepass2/KeePass/Forms/PwEntryForm.cs
-@@ -657,7 +657,7 @@ namespace KeePass.Forms
+@@ -662,7 +662,7 @@ namespace KeePass.Forms
  
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				KeePass.Properties.Resources.B48x48_KGPG_Sign, strTitle, strDesc);
@@ -624,7 +638,7 @@ Index: keepass2/KeePass/Forms/PwEntryForm.cs
 +			this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
  			this.Text = strTitle;
  
- 			m_imgPwGen = UIUtil.CreateDropDownImage(Properties.Resources.B16x16_Key_New);
+ 			m_imgGenPw = UIUtil.CreateDropDownImage(Properties.Resources.B16x16_Key_New);
 Index: keepass2/KeePass/Forms/PwGeneratorForm.cs
 ===================================================================
 --- keepass2.orig/KeePass/Forms/PwGeneratorForm.cs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/keepass2.git

More information about the Pkg-cli-apps-commits mailing list