[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. upstream/2.14.dfsg-76-g6a006d9
Julian Taylor
jtaylor.debian at googlemail.com
Sun Apr 10 15:20:02 UTC 2011
The following commit has been merged in the master branch:
commit 17c7dae1688a56939314a5e3b1ce3664202779cb
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Sun Apr 10 16:07:59 2011 +0200
refresh patches
diff --git a/debian/patches/01_change_signing_key.patch b/debian/patches/01_change_signing_key.patch
index 8179030..35e1380 100644
--- a/debian/patches/01_change_signing_key.patch
+++ b/debian/patches/01_change_signing_key.patch
@@ -1,5 +1,14 @@
+From: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
+Date: Sun, 10 Apr 2011 15:46:08 +0200
+Subject: 01_change_signing_key
+
+---
+ KeePass/KeePass.csproj | 2 +-
+ KeePassLib/KeePassLib.csproj | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index d42b55c..17f03ce 100644
+index af89b98..6fe95b3 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
@@ -11,7 +11,7 @@
@@ -12,7 +21,7 @@ index d42b55c..17f03ce 100644
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
diff --git a/KeePassLib/KeePassLib.csproj b/KeePassLib/KeePassLib.csproj
-index a127a30..2fea48f 100644
+index a127a30..0a9c332 100644
--- a/KeePassLib/KeePassLib.csproj
+++ b/KeePassLib/KeePassLib.csproj
@@ -10,7 +10,7 @@
@@ -24,3 +33,4 @@ index a127a30..2fea48f 100644
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
+--
diff --git a/debian/patches/02_avoid_broken_res.patch b/debian/patches/02_avoid_broken_res.patch
index d27de69..cb91612 100644
--- a/debian/patches/02_avoid_broken_res.patch
+++ b/debian/patches/02_avoid_broken_res.patch
@@ -1,11 +1,54 @@
+Date: Sun, 10 Apr 2011 15:46:08 +0200
Description: do not use ressources for *.ico files
use installed icons instead of pulling them from the ressource.
This avoids a UnknownImageFormat error probably caused by mono bug.
Bugs-mono: https://bugzilla.novell.com/show_bug.cgi?id=599462
Author: Julian Taylor <jtaylor.debian at googlemail.com>
+---
+ KeePass/Forms/AboutForm.cs | 4 ++--
+ KeePass/Forms/CharPickerForm.cs | 2 +-
+ KeePass/Forms/ColumnsForm.cs | 2 +-
+ KeePass/Forms/DataEditorForm.cs | 2 +-
+ KeePass/Forms/DataViewerForm.cs | 2 +-
+ KeePass/Forms/DatabaseOperationsForm.cs | 2 +-
+ KeePass/Forms/DatabaseSettingsForm.cs | 2 +-
+ KeePass/Forms/EcasTriggerForm.cs | 2 +-
+ KeePass/Forms/EcasTriggersForm.cs | 2 +-
+ KeePass/Forms/EditAutoTypeItemForm.cs | 2 +-
+ KeePass/Forms/EditStringForm.cs | 2 +-
+ KeePass/Forms/EntropyForm.cs | 2 +-
+ KeePass/Forms/EntryListForm.cs | 2 +-
+ KeePass/Forms/EntryReportForm.cs | 2 +-
+ KeePass/Forms/ExchangeDataForm.cs | 2 +-
+ KeePass/Forms/FileBrowserForm.cs | 2 +-
+ KeePass/Forms/GroupForm.cs | 2 +-
+ KeePass/Forms/HelpSourceForm.cs | 2 +-
+ KeePass/Forms/IOConnectionForm.cs | 2 +-
+ KeePass/Forms/IconPickerForm.cs | 2 +-
+ KeePass/Forms/ImportCsvForm.cs | 2 +-
+ KeePass/Forms/ImportMethodForm.cs | 2 +-
+ KeePass/Forms/InternalBrowserForm.cs | 2 +-
+ KeePass/Forms/KeyCreationForm.cs | 2 +-
+ KeePass/Forms/KeyPromptForm.cs | 2 +-
+ KeePass/Forms/LanguageForm.cs | 2 +-
+ KeePass/Forms/MainForm.cs | 2 +-
+ KeePass/Forms/MainForm_Functions.cs | 12 ++++++------
+ KeePass/Forms/OptionsForm.cs | 2 +-
+ KeePass/Forms/PluginsForm.cs | 2 +-
+ KeePass/Forms/PrintForm.cs | 2 +-
+ KeePass/Forms/PwEntryForm.cs | 2 +-
+ KeePass/Forms/PwGeneratorForm.cs | 2 +-
+ KeePass/Forms/SearchForm.cs | 2 +-
+ KeePass/Forms/SingleLineEditForm.cs | 2 +-
+ KeePass/Forms/StatusLoggerForm.cs | 2 +-
+ KeePass/Forms/TanWizardForm.cs | 2 +-
+ KeePass/Forms/UrlSchemeForm.cs | 2 +-
+ KeePass/Forms/UrlSchemesForm.cs | 2 +-
+ 39 files changed, 45 insertions(+), 45 deletions(-)
+
diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
-index 4c7ec31..7cc5208 100644
+index 3e0ad1d..da4f0a4 100644
--- a/KeePass/Forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
@@ -56,12 +56,12 @@ namespace KeePass.Forms
@@ -24,20 +67,20 @@ index 4c7ec31..7cc5208 100644
m_lvComponents.Columns.Add(KPRes.Components, 100, HorizontalAlignment.Left);
m_lvComponents.Columns.Add(KPRes.Version, 100, HorizontalAlignment.Left);
diff --git a/KeePass/Forms/CharPickerForm.cs b/KeePass/Forms/CharPickerForm.cs
-index b105e86..3d42e18 100644
+index 870a252..00f4fdb 100644
--- a/KeePass/Forms/CharPickerForm.cs
+++ b/KeePass/Forms/CharPickerForm.cs
-@@ -94,7 +94,7 @@ namespace KeePass.Forms
+@@ -105,7 +105,7 @@ namespace KeePass.Forms
m_fontChars = new Font("Tahoma", 8.25f, FontStyle.Bold);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- this.Text = KPRes.PickCharacters;
+ this.Text = KPRes.PickCharacters + " - " + PwDefs.ShortProductName;
m_secWord.Attach(m_tbSelected, OnSelectedTextChangedEx, true);
diff --git a/KeePass/Forms/ColumnsForm.cs b/KeePass/Forms/ColumnsForm.cs
-index 1546fa9..4ce4c39 100644
+index 3226713..b159327 100644
--- a/KeePass/Forms/ColumnsForm.cs
+++ b/KeePass/Forms/ColumnsForm.cs
@@ -56,7 +56,7 @@ namespace KeePass.Forms
@@ -50,7 +93,7 @@ index 1546fa9..4ce4c39 100644
int nWidth = (m_lvColumns.ClientRectangle.Width -
diff --git a/KeePass/Forms/DataEditorForm.cs b/KeePass/Forms/DataEditorForm.cs
-index 927e570..fa1042b 100644
+index 7b2c867..38b2523 100644
--- a/KeePass/Forms/DataEditorForm.cs
+++ b/KeePass/Forms/DataEditorForm.cs
@@ -98,7 +98,7 @@ namespace KeePass.Forms
@@ -63,7 +106,7 @@ index 927e570..fa1042b 100644
m_bdc = BinaryDataClassifier.Classify(m_strDataDesc, m_pbData);
diff --git a/KeePass/Forms/DataViewerForm.cs b/KeePass/Forms/DataViewerForm.cs
-index faf5312..62099ac 100644
+index 35995c6..6431f1c 100644
--- a/KeePass/Forms/DataViewerForm.cs
+++ b/KeePass/Forms/DataViewerForm.cs
@@ -71,7 +71,7 @@ namespace KeePass.Forms
@@ -89,10 +132,10 @@ index e8dbc8b..1988645 100644
m_numHistoryDays.Value = m_pwDatabase.MaintenanceHistoryDays;
diff --git a/KeePass/Forms/DatabaseSettingsForm.cs b/KeePass/Forms/DatabaseSettingsForm.cs
-index 6fd4de4..ff4b1c1 100644
+index 4589b57..eb0b111 100644
--- a/KeePass/Forms/DatabaseSettingsForm.cs
+++ b/KeePass/Forms/DatabaseSettingsForm.cs
-@@ -73,7 +73,7 @@ namespace KeePass.Forms
+@@ -78,7 +78,7 @@ namespace KeePass.Forms
m_bannerImage.Height, BannerStyle.Default,
Properties.Resources.B48x48_Ark, KPRes.DatabaseSettings,
KPRes.DatabaseSettingsDesc);
@@ -102,7 +145,7 @@ index 6fd4de4..ff4b1c1 100644
m_bInitializing = true;
diff --git a/KeePass/Forms/EcasTriggerForm.cs b/KeePass/Forms/EcasTriggerForm.cs
-index 09de0fb..7dc54ec 100644
+index c42b9d1..689b78c 100644
--- a/KeePass/Forms/EcasTriggerForm.cs
+++ b/KeePass/Forms/EcasTriggerForm.cs
@@ -68,7 +68,7 @@ namespace KeePass.Forms
@@ -115,7 +158,7 @@ index 09de0fb..7dc54ec 100644
m_lvEvents.SmallImageList = m_ilIcons;
m_lvConditions.SmallImageList = m_ilIcons;
diff --git a/KeePass/Forms/EcasTriggersForm.cs b/KeePass/Forms/EcasTriggersForm.cs
-index 665426c..bf3fec3 100644
+index 3c27e5d..4e97d60 100644
--- a/KeePass/Forms/EcasTriggersForm.cs
+++ b/KeePass/Forms/EcasTriggersForm.cs
@@ -83,7 +83,7 @@ namespace KeePass.Forms
@@ -128,20 +171,20 @@ index 665426c..bf3fec3 100644
int nWidth = (m_lvTriggers.ClientSize.Width - UIUtil.GetVScrollBarWidth() - 1);
m_lvTriggers.Columns.Add(KPRes.Triggers, nWidth);
diff --git a/KeePass/Forms/EditAutoTypeItemForm.cs b/KeePass/Forms/EditAutoTypeItemForm.cs
-index e5801da..f778324 100644
+index 7d4b6f9..8abd7b4 100644
--- a/KeePass/Forms/EditAutoTypeItemForm.cs
+++ b/KeePass/Forms/EditAutoTypeItemForm.cs
-@@ -116,7 +116,7 @@ namespace KeePass.Forms
+@@ -119,7 +119,7 @@ namespace KeePass.Forms
KPRes.ConfigureKeystrokeSeqDesc);
}
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- // m_clrOriginalForeground = m_lblOpenHint.ForeColor;
- m_clrOriginalBackground = m_cmbWindow.BackColor;
+ UIUtil.EnableAutoCompletion(m_cmbWindow, false);
+
diff --git a/KeePass/Forms/EditStringForm.cs b/KeePass/Forms/EditStringForm.cs
-index 7893794..87000f1 100644
+index 1492fe0..598d0d3 100644
--- a/KeePass/Forms/EditStringForm.cs
+++ b/KeePass/Forms/EditStringForm.cs
@@ -95,7 +95,7 @@ namespace KeePass.Forms
@@ -154,10 +197,10 @@ index 7893794..87000f1 100644
m_clrNormalBackground = m_cmbStringName.BackColor;
diff --git a/KeePass/Forms/EntropyForm.cs b/KeePass/Forms/EntropyForm.cs
-index 2a92099..94ecdbe 100644
+index 0deb64a..fd90733 100644
--- a/KeePass/Forms/EntropyForm.cs
+++ b/KeePass/Forms/EntropyForm.cs
-@@ -71,7 +71,7 @@ namespace KeePass.Forms
+@@ -72,7 +72,7 @@ namespace KeePass.Forms
m_bannerImage.Height, BannerStyle.Default,
Properties.Resources.B48x48_Binary, KPRes.EntropyTitle,
KPRes.EntropyDesc);
@@ -205,8 +248,21 @@ index eb665aa..c87d1e9 100644
this.Text = strWndTitle;
+diff --git a/KeePass/Forms/FileBrowserForm.cs b/KeePass/Forms/FileBrowserForm.cs
+index a75cf76..9b0d31c 100644
+--- a/KeePass/Forms/FileBrowserForm.cs
++++ b/KeePass/Forms/FileBrowserForm.cs
+@@ -93,7 +93,7 @@ namespace KeePass.Forms
+ {
+ GlobalWindowManager.AddWindow(this);
+
+- this.Icon = Properties.Resources.KeePass;
++ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+ this.Text = m_strTitle;
+
+ m_nIconDim = m_tvFolders.ItemHeight;
diff --git a/KeePass/Forms/GroupForm.cs b/KeePass/Forms/GroupForm.cs
-index 1eb0731..7aa2cc4 100644
+index 73473b0..129b155 100644
--- a/KeePass/Forms/GroupForm.cs
+++ b/KeePass/Forms/GroupForm.cs
@@ -67,7 +67,7 @@ namespace KeePass.Forms
@@ -232,7 +288,7 @@ index f49d81a..c9c97e6 100644
FontUtil.AssignDefaultBold(m_radioLocal);
diff --git a/KeePass/Forms/IOConnectionForm.cs b/KeePass/Forms/IOConnectionForm.cs
-index 3cf5c42..0ee5063 100644
+index 16caca0..17e0668 100644
--- a/KeePass/Forms/IOConnectionForm.cs
+++ b/KeePass/Forms/IOConnectionForm.cs
@@ -77,7 +77,7 @@ namespace KeePass.Forms
@@ -245,7 +301,7 @@ index 3cf5c42..0ee5063 100644
FontUtil.AssignDefaultBold(m_lblUrl);
diff --git a/KeePass/Forms/IconPickerForm.cs b/KeePass/Forms/IconPickerForm.cs
-index bd99afb..505fa82 100644
+index 70bdafc..ec3596d 100644
--- a/KeePass/Forms/IconPickerForm.cs
+++ b/KeePass/Forms/IconPickerForm.cs
@@ -79,7 +79,7 @@ namespace KeePass.Forms
@@ -284,7 +340,7 @@ index 0c44925..f190bea 100644
this.Text = KPRes.ImportBehavior;
diff --git a/KeePass/Forms/InternalBrowserForm.cs b/KeePass/Forms/InternalBrowserForm.cs
-index d3759df..d18ca04 100644
+index f8fc293..428a4cb 100644
--- a/KeePass/Forms/InternalBrowserForm.cs
+++ b/KeePass/Forms/InternalBrowserForm.cs
@@ -53,7 +53,7 @@ namespace KeePass.Forms
@@ -294,10 +350,10 @@ index d3759df..d18ca04 100644
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- Debug.Assert(m_pgDataSource != null);
-
+ if(m_strInitialUrl.Length > 0)
+ m_webBrowser.Navigate(m_strInitialUrl);
diff --git a/KeePass/Forms/KeyCreationForm.cs b/KeePass/Forms/KeyCreationForm.cs
-index db1f0bf..c0b9a03 100644
+index 21982b9..02513c6 100644
--- a/KeePass/Forms/KeyCreationForm.cs
+++ b/KeePass/Forms/KeyCreationForm.cs
@@ -80,7 +80,7 @@ namespace KeePass.Forms
@@ -310,13 +366,13 @@ index db1f0bf..c0b9a03 100644
FontUtil.AssignDefaultBold(m_cbPassword);
diff --git a/KeePass/Forms/KeyPromptForm.cs b/KeePass/Forms/KeyPromptForm.cs
-index 5b05701..c322b63 100644
+index 160de6f..0463261 100644
--- a/KeePass/Forms/KeyPromptForm.cs
+++ b/KeePass/Forms/KeyPromptForm.cs
-@@ -98,7 +98,7 @@ namespace KeePass.Forms
+@@ -120,7 +120,7 @@ namespace KeePass.Forms
+ m_bannerImage.Image = BannerFactory.CreateBanner(m_bannerImage.Width,
m_bannerImage.Height, BannerStyle.Default,
- Properties.Resources.B48x48_KGPG_Key2, KPRes.EnterCompositeKey,
- strBannerDesc);
+ Properties.Resources.B48x48_KGPG_Key2, strBannerTitle, strBannerDesc);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
@@ -336,10 +392,10 @@ index ba302dc..8478a23 100644
int nWidth = m_lvLanguages.ClientRectangle.Width / 4;
diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs
-index a1923d8..ff209f4 100644
+index 7e05058..441f06a 100644
--- a/KeePass/Forms/MainForm.cs
+++ b/KeePass/Forms/MainForm.cs
-@@ -116,7 +116,7 @@ namespace KeePass.Forms
+@@ -118,7 +118,7 @@ namespace KeePass.Forms
m_strNeverExpiresText = KPRes.NeverExpires;
this.Text = PwDefs.ProductName;
@@ -349,39 +405,52 @@ index a1923d8..ff209f4 100644
m_imgFileSaveDisabled = Properties.Resources.B16x16_FileSave_Disabled;
// m_imgFileSaveAllEnabled = Properties.Resources.B16x16_File_SaveAll;
diff --git a/KeePass/Forms/MainForm_Functions.cs b/KeePass/Forms/MainForm_Functions.cs
-index 6f47062..a2dec4b 100644
+index d8c84c7..708f815 100644
--- a/KeePass/Forms/MainForm_Functions.cs
+++ b/KeePass/Forms/MainForm_Functions.cs
-@@ -348,8 +348,8 @@ namespace KeePass.Forms
- strNtfText = strNtfPre + WinUtil.CompactPath(iocLck.Path, 63 -
+@@ -374,12 +374,12 @@ namespace KeePass.Forms
strNtfPre.Length);
-- m_ntfTray.Icon = Properties.Resources.QuadLocked;
+ Icon icoDisposable, icoAssignable;
+- CreateColorizedIcon(Properties.Resources.QuadLocked, false,
++ CreateColorizedIcon(new Icon("/usr/share/keepass2/QuadLocked.ico"), false,
+ ref m_kvpIcoTrayLocked, out icoAssignable, out icoDisposable);
+ m_ntfTray.Icon = icoAssignable;
+ if(icoDisposable != null) icoDisposable.Dispose();
+
- TaskbarList.SetOverlayIcon(this, Properties.Resources.LockOverlay,
-+ m_ntfTray.Icon = new Icon("/usr/share/keepass2/QuadLocked.ico");
+ TaskbarList.SetOverlayIcon(this, new Icon("/usr/share/keepass2/LockOverlay.ico"),
KPRes.Locked);
NativeMethods.EnableWindowPeekPreview(this.Handle, false);
}
-@@ -358,7 +358,7 @@ namespace KeePass.Forms
- strWindowText = PwDefs.ProductName;
+@@ -389,7 +389,7 @@ namespace KeePass.Forms
strNtfText = strWindowText;
-- m_ntfTray.Icon = Properties.Resources.QuadNormal;
-+ m_ntfTray.Icon = new Icon("/usr/share/keepass2/QuadNormal.ico");
- TaskbarList.SetOverlayIcon(this, null, string.Empty);
- NativeMethods.EnableWindowPeekPreview(this.Handle, true);
- }
-@@ -383,7 +383,7 @@ namespace KeePass.Forms
- strNtfText = strNtfPre + WinUtil.CompactPath(
+ 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();
+@@ -419,7 +419,7 @@ namespace KeePass.Forms
m_docMgr.ActiveDatabase.IOConnectionInfo.Path, 63 - strNtfPre.Length);
-- m_ntfTray.Icon = Properties.Resources.QuadNormal;
-+ m_ntfTray.Icon = new Icon("/usr/share/keepass2/QuadNormal.ico");
- TaskbarList.SetOverlayIcon(this, null, string.Empty);
- NativeMethods.EnableWindowPeekPreview(this.Handle, true);
- }
-@@ -3040,7 +3040,7 @@ namespace KeePass.Forms
+ 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();
+@@ -434,7 +434,7 @@ namespace KeePass.Forms
+ m_ntfTray.Text = StrUtil.CompactString3Dots(strNtfText, 63);
+
+ Icon icoToDispose, icoToAssign;
+- if(CreateColorizedIcon(Properties.Resources.KeePass, true,
++ if(CreateColorizedIcon(new Icon("/usr/share/keepass2/KeePass.ico"), true,
+ ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
+ this.Icon = icoToAssign;
+ if(icoToDispose != null) icoToDispose.Dispose();
+@@ -3245,7 +3245,7 @@ namespace KeePass.Forms
// wasn't fully constructed at that time yet)
if(IsFileLocked(null))
TaskbarList.SetOverlayIcon(this,
@@ -391,7 +460,7 @@ index 6f47062..a2dec4b 100644
if(Program.Config.MainWindow.MinimizeToTray) MinimizeToTray(true);
diff --git a/KeePass/Forms/OptionsForm.cs b/KeePass/Forms/OptionsForm.cs
-index acee50f..b98d8a0 100644
+index d23e3e1..68ef6d4 100644
--- a/KeePass/Forms/OptionsForm.cs
+++ b/KeePass/Forms/OptionsForm.cs
@@ -104,7 +104,7 @@ namespace KeePass.Forms
@@ -404,7 +473,7 @@ index acee50f..b98d8a0 100644
Debug.Assert(m_ilIcons != null);
if(m_ilIcons != null)
diff --git a/KeePass/Forms/PluginsForm.cs b/KeePass/Forms/PluginsForm.cs
-index 4640ff3..fa17bf5 100644
+index cb2db6e..96c4d43 100644
--- a/KeePass/Forms/PluginsForm.cs
+++ b/KeePass/Forms/PluginsForm.cs
@@ -65,7 +65,7 @@ namespace KeePass.Forms
@@ -430,10 +499,10 @@ index 0f2e2a6..5d0e60c 100644
UIUtil.SetButtonImage(m_btnConfigPrinter,
diff --git a/KeePass/Forms/PwEntryForm.cs b/KeePass/Forms/PwEntryForm.cs
-index a5dd74b..fbb7800 100644
+index a34d423..c8d2534 100644
--- a/KeePass/Forms/PwEntryForm.cs
+++ b/KeePass/Forms/PwEntryForm.cs
-@@ -537,7 +537,7 @@ namespace KeePass.Forms
+@@ -547,7 +547,7 @@ namespace KeePass.Forms
BannerStyle.Default,
KeePass.Properties.Resources.B48x48_KGPG_Sign,
strTitle, strDesc);
@@ -443,7 +512,7 @@ index a5dd74b..fbb7800 100644
UIUtil.SetButtonImage(m_btnTools,
diff --git a/KeePass/Forms/PwGeneratorForm.cs b/KeePass/Forms/PwGeneratorForm.cs
-index 5ed642b..86663aa 100644
+index b69a014..5142164 100644
--- a/KeePass/Forms/PwGeneratorForm.cs
+++ b/KeePass/Forms/PwGeneratorForm.cs
@@ -91,7 +91,7 @@ namespace KeePass.Forms
@@ -456,7 +525,7 @@ index 5ed642b..86663aa 100644
UIUtil.SetButtonImage(m_btnProfileAdd,
Properties.Resources.B16x16_FileSaveAs, false);
diff --git a/KeePass/Forms/SearchForm.cs b/KeePass/Forms/SearchForm.cs
-index 01c50e5..e69a2ee 100644
+index ecaf06d..5c30687 100644
--- a/KeePass/Forms/SearchForm.cs
+++ b/KeePass/Forms/SearchForm.cs
@@ -91,7 +91,7 @@ namespace KeePass.Forms
@@ -469,7 +538,7 @@ index 01c50e5..e69a2ee 100644
SearchParameters sp = Program.Config.Defaults.SearchParameters;
m_cbTitle.Checked = sp.SearchInTitles;
diff --git a/KeePass/Forms/SingleLineEditForm.cs b/KeePass/Forms/SingleLineEditForm.cs
-index a867c34..bab7630 100644
+index e0e4a95..ca4e84a 100644
--- a/KeePass/Forms/SingleLineEditForm.cs
+++ b/KeePass/Forms/SingleLineEditForm.cs
@@ -74,7 +74,7 @@ namespace KeePass.Forms
@@ -521,7 +590,7 @@ index 4ff62a8..6b88f6d 100644
m_tbScheme.Text = m_ovr.Scheme;
diff --git a/KeePass/Forms/UrlSchemesForm.cs b/KeePass/Forms/UrlSchemesForm.cs
-index 130913c..ef5ddd2 100644
+index eadc777..c605501 100644
--- a/KeePass/Forms/UrlSchemesForm.cs
+++ b/KeePass/Forms/UrlSchemesForm.cs
@@ -54,7 +54,7 @@ namespace KeePass.Forms
@@ -533,3 +602,4 @@ index 130913c..ef5ddd2 100644
this.Text = KPRes.UrlSchemeOverrides;
int nWidth = (m_lvOverrides.ClientSize.Width - UIUtil.GetVScrollBarWidth()) / 4;
+--
diff --git a/debian/patches/03_use_free_icon.patch b/debian/patches/03_use_free_icon.patch
index 2d14598..48f71ea 100644
--- a/debian/patches/03_use_free_icon.patch
+++ b/debian/patches/03_use_free_icon.patch
@@ -1,7 +1,7 @@
-Index: keepass2/KeePass/Properties/Resources.resx
-===================================================================
---- keepass2.orig/KeePass/Properties/Resources.resx 2011-03-21 22:20:44.390155001 +0100
-+++ keepass2/KeePass/Properties/Resources.resx 2011-03-21 22:20:51.660155001 +0100
+diff --git a/KeePass/Properties/Resources.resx b/KeePass/Properties/Resources.resx
+index 14a41ca..66d9396 100644
+--- a/KeePass/Properties/Resources.resx
++++ b/KeePass/Properties/Resources.resx
@@ -416,43 +416,43 @@
<value>..\Resources\Nuvola\B48x48_Run.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -116,7 +116,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</data>
<data name="B48x48_View_Detailed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Nuvola\B48x48_View_Detailed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -548,12 +548,12 @@
+@@ -548,13 +548,13 @@
<value>..\Resources\Icons\LockOverlay.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_PwPrompter" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -131,5 +131,15 @@ Index: keepass2/KeePass/Properties/Resources.resx
- <value>..\Resources\Images\B16x16_Imp_DataVault.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_MenuRadio" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Images\B16x16_MenuRadio.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+@@ -563,6 +563,6 @@
+ <value>..\Resources\Nuvola\B16x16_KaboodleLoop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="B16x16_Imp_PwsPlus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+- <value>..\Resources\Images\B16x16_Imp_PwsPlus.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/04_no_sgen.patch b/debian/patches/04_no_sgen.patch
index 8c8c36f..66a205b 100644
--- a/debian/patches/04_no_sgen.patch
+++ b/debian/patches/04_no_sgen.patch
@@ -1,8 +1,16 @@
+From: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
+Date: Sun, 10 Apr 2011 15:46:08 +0200
+Subject: 04_no_sgen
+
+---
+ KeePass/KeePass.csproj | 5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index d42b55c..b744c9e 100644
+index 6fe95b3..f6db9c6 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
-@@ -1165,7 +1165,4 @@
+@@ -1186,7 +1186,4 @@
<Target Name="AfterBuild">
</Target>
-->
@@ -12,3 +20,4 @@ index d42b55c..b744c9e 100644
-</Project>
\ No newline at end of file
+</Project>
+--
--
keepass2
More information about the Pkg-cli-apps-commits
mailing list