[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. debian/2.22+dfsg-1-6-gb4c7ac1

Julian Taylor jtaylor.debian at googlemail.com
Sat Jul 27 11:25:02 UTC 2013 

The following commit has been merged in the master branch:
commit 346148907f424672ba2c81395d2c6f9119db1094
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Sat Jul 27 13:04:36 2013 +0200

    New upstream release
    
     - LP: #1011349
     - LP: #1174073

diff --git a/debian/README.source b/debian/README.source
index c4e8f6d..3f13ec7 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -19,6 +19,7 @@ D	KeePass/Resources/Images/B16x16_Imp_HandySafe.png
 D	KeePass/Resources/Images/B16x16_Imp_HandySafePro.png
 D	KeePass/Resources/Images/B16x16_Imp_KasperskyPwMgr.png
 D	KeePass/Resources/Images/B16x16_Imp_LastPass.png
+D	KeePass/Resources/Images/B16x16_Imp_NetworkPwMgr.png
 D	KeePass/Resources/Images/B16x16_Imp_OnePwPro.png
 D	KeePass/Resources/Images/B16x16_Imp_PINs.png
 D	KeePass/Resources/Images/B16x16_Imp_PVault.png
diff --git a/debian/changelog b/debian/changelog
index 1c5698b..2541269 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+keepass2 (2.23+dfsg-1) unstable; urgency=low
+
+  * New upstream release
+    - LP: #1011349
+    - LP: #1174073
+  * Upload to unstable
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 27 Jul 2013 13:08:49 +0200
+
 keepass2 (2.22+dfsg-1) experimental; urgency=low
 
   * New upstream release (LP: #801414)
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 955ee8a..24cba13 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 | 62 +++++++++++++++++++--------------------
- 1 file changed, 31 insertions(+), 31 deletions(-)
+ KeePass/Properties/Resources.resx | 66 +++++++++++++++++++--------------------
+ 1 file changed, 33 insertions(+), 33 deletions(-)
 
 --- a/KeePass/Properties/Resources.resx
 +++ b/KeePass/Properties/Resources.resx
@@ -153,7 +153,7 @@ Forwarded: not-needed
    </data>
    <data name="B16x16_EditCopyLink" type="System.Resources.ResXFileRef, System.Windows.Forms">
      <value>..\Resources\Nuvola_Derived\B16x16_EditCopyLink.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -572,15 +572,15 @@
+@@ -572,19 +572,19 @@
      <value>..\Resources\Nuvola_Derived\B16x16_Key_New.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    </data>
    <data name="B16x16_Imp_DesktopKnox" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -172,5 +172,16 @@ Forwarded: not-needed
 -    <value>..\Resources\Images\B16x16_Imp_TurboPws.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>
+   <data name="B16x16_Imp_NetworkPwMgr" type="System.Resources.ResXFileRef, System.Windows.Forms">
+-    <value>..\Resources\Images\B16x16_Imp_NetworkPwMgr.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_Folder_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+     <value>..\Resources\Nuvola_Derived\B16x16_Folder_2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+@@ -598,4 +598,4 @@
+   <data name="MostPopularPasswords" type="System.Resources.ResXFileRef, System.Windows.Forms">
+     <value>..\Resources\Data\MostPopularPasswords.txt.gz;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</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 d75fa3d..59e7e7e 100644
--- a/debian/patches/fix-XSL-search-path.patch
+++ b/debian/patches/fix-XSL-search-path.patch
@@ -23,7 +23,7 @@ Forwarded: not-needed
  		public const string XslFileHtmlFull = "KDBX_DetailsFull.xsl";
 --- a/KeePass/Forms/AboutForm.cs
 +++ b/KeePass/Forms/AboutForm.cs
-@@ -88,8 +88,7 @@ namespace KeePass.Forms
+@@ -89,8 +89,7 @@ namespace KeePass.Forms
  			m_lvComponents.Items.Add(lvi);
  
  			lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);
diff --git a/debian/patches/skip-sgen-run-during-build.patch b/debian/patches/skip-sgen-run-during-build.patch
index a211e20..b051c6f 100644
--- a/debian/patches/skip-sgen-run-during-build.patch
+++ b/debian/patches/skip-sgen-run-during-build.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
 
 --- a/KeePass/KeePass.csproj
 +++ b/KeePass/KeePass.csproj
-@@ -1258,7 +1258,4 @@
+@@ -1264,7 +1264,4 @@
    <Target Name="AfterBuild">
    </Target>
    -->
diff --git a/debian/patches/use-installed-ico-files.patch b/debian/patches/use-installed-ico-files.patch
index 721a26b..334f995 100644
--- a/debian/patches/use-installed-ico-files.patch
+++ b/debian/patches/use-installed-ico-files.patch
@@ -72,7 +72,7 @@ Forwarded: not-needed
 +			this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
  
  			m_lvComponents.Columns.Add(KPRes.Component, 100, HorizontalAlignment.Left);
- 			m_lvComponents.Columns.Add(KPRes.Version, 100, HorizontalAlignment.Left);
+ 			m_lvComponents.Columns.Add(KPRes.Status + " / " + KPRes.Version, 100,
 --- a/KeePass/Forms/AutoTypeCtxForm.cs
 +++ b/KeePass/Forms/AutoTypeCtxForm.cs
 @@ -70,7 +70,7 @@ namespace KeePass.Forms
@@ -97,7 +97,7 @@ Forwarded: not-needed
  			m_secWord.Attach(m_tbSelected, OnSelectedTextChangedEx, true);
 --- a/KeePass/Forms/ColumnsForm.cs
 +++ b/KeePass/Forms/ColumnsForm.cs
-@@ -57,7 +57,7 @@ namespace KeePass.Forms
+@@ -58,7 +58,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_View_Detailed,
  				KPRes.ConfigureColumns, KPRes.ConfigureColumnsDesc);
@@ -163,7 +163,7 @@ Forwarded: not-needed
  
 --- a/KeePass/Forms/DuplicationForm.cs
 +++ b/KeePass/Forms/DuplicationForm.cs
-@@ -54,7 +54,7 @@ namespace KeePass.Forms
+@@ -100,7 +100,7 @@ namespace KeePass.Forms
  		{
  			GlobalWindowManager.AddWindow(this);
  
@@ -251,7 +251,7 @@ Forwarded: not-needed
  			UIUtil.PrepareStandardMultilineControl(m_richStringValue, true, true);
 --- a/KeePass/Forms/EntropyForm.cs
 +++ b/KeePass/Forms/EntropyForm.cs
-@@ -71,7 +71,7 @@ namespace KeePass.Forms
+@@ -74,7 +74,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_Binary, KPRes.EntropyTitle,
  				KPRes.EntropyDesc);
@@ -317,15 +317,15 @@ Forwarded: not-needed
  			m_nIconDim = m_tvFolders.ItemHeight;
 --- a/KeePass/Forms/GroupForm.cs
 +++ b/KeePass/Forms/GroupForm.cs
-@@ -68,7 +68,7 @@ namespace KeePass.Forms
+@@ -78,7 +78,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
- 				Properties.Resources.B48x48_Folder_Txt, KPRes.EditGroup,
- 				KPRes.EditGroupDesc);
+ 				Properties.Resources.B48x48_Folder_Txt, strTitle,
+ 				(m_bCreatingNew ? KPRes.AddGroupDesc : KPRes.EditGroupDesc));
 -			this.Icon = Properties.Resources.KeePass;
 +			this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+ 			this.Text = strTitle;
  
  			UIUtil.SetButtonImage(m_btnAutoTypeEdit,
- 				Properties.Resources.B16x16_Wizard, true);
 --- a/KeePass/Forms/HelpSourceForm.cs
 +++ b/KeePass/Forms/HelpSourceForm.cs
 @@ -47,7 +47,7 @@ namespace KeePass.Forms
@@ -394,7 +394,7 @@ Forwarded: not-needed
  			FontUtil.SetDefaultFont(m_cbPassword);
 --- a/KeePass/Forms/KeyPromptForm.cs
 +++ b/KeePass/Forms/KeyPromptForm.cs
-@@ -115,7 +115,7 @@ namespace KeePass.Forms
+@@ -116,7 +116,7 @@ namespace KeePass.Forms
  			string strBannerDesc = WinUtil.CompactPath(m_ioInfo.Path, 45);
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_KGPG_Key2, strBannerTitle, strBannerDesc);
@@ -416,10 +416,10 @@ Forwarded: not-needed
  			int nWidth = m_lvLanguages.ClientRectangle.Width / 4;
 --- a/KeePass/Forms/MainForm.cs
 +++ b/KeePass/Forms/MainForm.cs
-@@ -135,7 +135,7 @@ namespace KeePass.Forms
+@@ -140,7 +140,7 @@ namespace KeePass.Forms
  			m_strNeverExpiresText = KPRes.NeverExpires;
  
- 			this.Text = PwDefs.ProductName;
+ 			this.Text = PwDefs.ShortProductName;
 -			this.Icon = Properties.Resources.KeePass;
 +			this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
  			m_imgFileSaveEnabled = Properties.Resources.B16x16_FileSave;
@@ -427,8 +427,8 @@ Forwarded: not-needed
  			// m_imgFileSaveAllEnabled = Properties.Resources.B16x16_File_SaveAll;
 --- a/KeePass/Forms/MainForm_Functions.cs
 +++ b/KeePass/Forms/MainForm_Functions.cs
-@@ -405,12 +405,12 @@ namespace KeePass.Forms
- 					strNtfPre.Length);
+@@ -423,19 +423,19 @@ namespace KeePass.Forms
+ 				strNtfText = strNtfPre + strFileDesc;
  
  				Icon icoDisposable, icoAssignable;
 -				CreateColorizedIcon(Properties.Resources.QuadLocked, false,
@@ -442,16 +442,15 @@ Forwarded: not-needed
  					KPRes.Locked);
  				DwmUtil.EnableWindowPeekPreview(this, false);
  			}
-@@ -420,7 +420,7 @@ namespace KeePass.Forms
- 				strNtfText = strWindowText;
- 
+ 			else if(s.DatabaseOpened == false)
+ 			{
  				Icon icoDisposable, icoAssignable;
 -				CreateColorizedIcon(Properties.Resources.QuadNormal, false,
 +				CreateColorizedIcon(new Icon("/usr/share/keepass2/QuadNormal.ico"), false,
  					ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
  				m_ntfTray.Icon = icoAssignable;
  				if(icoDisposable != null) icoDisposable.Dispose();
-@@ -450,7 +450,7 @@ namespace KeePass.Forms
+@@ -459,7 +459,7 @@ namespace KeePass.Forms
  					m_docMgr.ActiveDatabase.IOConnectionInfo.Path, 63 - strNtfPre.Length);
  
  				Icon icoDisposable, icoAssignable;
@@ -460,7 +459,7 @@ Forwarded: not-needed
  					ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
  				m_ntfTray.Icon = icoAssignable;
  				if(icoDisposable != null) icoDisposable.Dispose();
-@@ -474,7 +474,7 @@ namespace KeePass.Forms
+@@ -483,7 +483,7 @@ namespace KeePass.Forms
  			m_ntfTray.Text = StrUtil.CompactString3Dots(strNtfText, 63);
  
  			Icon icoToDispose, icoToAssign;
@@ -469,7 +468,7 @@ Forwarded: not-needed
  				ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
  				this.Icon = icoToAssign;
  			if(icoToDispose != null) icoToDispose.Dispose();
-@@ -2545,7 +2545,7 @@ namespace KeePass.Forms
+@@ -2548,7 +2548,7 @@ namespace KeePass.Forms
  				m_bTaskbarButtonMessage = true;
  			}
  			// else if(m.Msg == DwmUtil.WM_DWMSENDICONICTHUMBNAIL)
@@ -478,7 +477,7 @@ Forwarded: not-needed
  
  			base.WndProc(ref m);
  		}
-@@ -3539,7 +3539,7 @@ namespace KeePass.Forms
+@@ -3546,7 +3546,7 @@ namespace KeePass.Forms
  					// wasn't fully constructed at that time yet)
  					// if(IsFileLocked(null))
  					//	TaskbarList.SetOverlayIcon(this,
@@ -489,7 +488,7 @@ Forwarded: not-needed
  				if(Program.Config.MainWindow.MinimizeToTray) MinimizeToTray(true);
 --- a/KeePass/Forms/OptionsForm.cs
 +++ b/KeePass/Forms/OptionsForm.cs
-@@ -107,7 +107,7 @@ namespace KeePass.Forms
+@@ -110,7 +110,7 @@ namespace KeePass.Forms
  
  			GlobalWindowManager.AddWindow(this);
  
@@ -544,7 +543,7 @@ Forwarded: not-needed
  			m_imgPwGen = UIUtil.CreateDropDownImage(Properties.Resources.B16x16_Key_New);
 --- a/KeePass/Forms/PwGeneratorForm.cs
 +++ b/KeePass/Forms/PwGeneratorForm.cs
-@@ -90,7 +90,7 @@ namespace KeePass.Forms
+@@ -98,7 +98,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_KGPG_Gen, KPRes.PasswordOptions,
  				KPRes.PasswordOptionsDesc);

-- 
keepass2

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