[Pkg-cli-apps-commits] [keepass2] 04/05: New upstream release (Closes: #817781)
Julian Taylor
jtaylor.debian at googlemail.com
Sun Mar 20 14:53:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
jtaylor-guest pushed a commit to branch master
in repository keepass2.
commit 66512df1b1d479068b7fdd6b80208c9ef5b7f8f0
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Sun Mar 20 15:06:48 2016 +0100
New upstream release (Closes: #817781)
---
debian/changelog | 8 ++++
debian/patches/do-not-use-the-non-free-icons.patch | 16 +++++--
debian/patches/fix-XSL-search-path.patch | 6 +--
debian/patches/force_toolsversion_4 | 8 ++--
debian/patches/skip-sgen-run-during-build.patch | 4 +-
debian/patches/use-installed-ico-files.patch | 50 +++++++++++-----------
debian/patches/use-the-mono-signing-key.patch | 4 +-
7 files changed, 57 insertions(+), 39 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f089829..aff49cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+keepass2 (2.32+dfsg-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #817781)
+ * verify signature of source automatically via uscan
+ * create dfsg tarball via debian/copyright and uscan
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Sun, 20 Mar 2016 15:05:16 +0100
+
keepass2 (2.31+dfsg-1) unstable; urgency=medium
* New upstream release (Closes: #810567)
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 eff2b3a..84198a4 100644
--- a/debian/patches/do-not-use-the-non-free-icons.patch
+++ b/debian/patches/do-not-use-the-non-free-icons.patch
@@ -4,11 +4,11 @@ Subject: do not use the non-free icons
Forwarded: not-needed
---
- KeePass/Properties/Resources.resx | 70 +++++++++++++++++++--------------------
- 1 file changed, 35 insertions(+), 35 deletions(-)
+ KeePass/Properties/Resources.resx | 74 +++++++++++++++++++--------------------
+ 1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/KeePass/Properties/Resources.resx b/KeePass/Properties/Resources.resx
-index 1f7acfc..ff28a03 100644
+index 7fee6b0..2905801 100644
--- a/KeePass/Properties/Resources.resx
+++ b/KeePass/Properties/Resources.resx
@@ -404,40 +404,40 @@
@@ -197,3 +197,13 @@ index 1f7acfc..ff28a03 100644
</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,6 +629,6 @@
+ <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">
+- <value>..\Resources\Images\B16x16_Imp_NPassword.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 5341b20..7dc446d 100644
--- a/debian/patches/fix-XSL-search-path.patch
+++ b/debian/patches/fix-XSL-search-path.patch
@@ -11,7 +11,7 @@ Forwarded: not-needed
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/KeePass/App/AppDefs.cs b/KeePass/App/AppDefs.cs
-index 469cb65..ef07db9 100644
+index f309b25..e3925d0 100644
--- a/KeePass/App/AppDefs.cs
+++ b/KeePass/App/AppDefs.cs
@@ -36,6 +36,8 @@ namespace KeePass.App
@@ -24,10 +24,10 @@ index 469cb65..ef07db9 100644
public const string XslFileHtmlLite = "KDBX_DetailsLite.xsl";
public const string XslFileHtmlFull = "KDBX_DetailsFull.xsl";
diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
-index 193ecdc..2cd96cf 100644
+index 57c0a4d..4646221 100644
--- a/KeePass/Forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
-@@ -85,8 +85,7 @@ namespace KeePass.Forms
+@@ -86,8 +86,7 @@ namespace KeePass.Forms
m_lvComponents.Items.Add(lvi);
lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);
diff --git a/debian/patches/force_toolsversion_4 b/debian/patches/force_toolsversion_4
index 1221ea2..02bc1fa 100644
--- a/debian/patches/force_toolsversion_4
+++ b/debian/patches/force_toolsversion_4
@@ -21,7 +21,7 @@ index b955428..ca4da98 100644
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}"
EndProject
diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index 27be521..a0de64f 100644
+index a91521c..3af4735 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
@@ -1,4 +1,4 @@
@@ -30,7 +30,7 @@ index 27be521..a0de64f 100644
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -1323,4 +1323,4 @@
+@@ -1334,4 +1334,4 @@
<Target Name="AfterBuild">
</Target>
-->
@@ -38,7 +38,7 @@ index 27be521..a0de64f 100644
\ No newline at end of file
+</Project>
diff --git a/KeePassLib/KeePassLib.csproj b/KeePassLib/KeePassLib.csproj
-index 0a30ef8..c7436f9 100644
+index 9f6151a..ffc2814 100644
--- a/KeePassLib/KeePassLib.csproj
+++ b/KeePassLib/KeePassLib.csproj
@@ -1,4 +1,4 @@
@@ -47,7 +47,7 @@ index 0a30ef8..c7436f9 100644
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -144,4 +144,4 @@
+@@ -147,4 +147,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 3d66e74..0746301 100644
--- a/debian/patches/skip-sgen-run-during-build.patch
+++ b/debian/patches/skip-sgen-run-during-build.patch
@@ -8,10 +8,10 @@ Forwarded: not-needed
1 file changed, 3 deletions(-)
diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index 021ae11..27be521 100644
+index cab8d44..a91521c 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
-@@ -1323,7 +1323,4 @@
+@@ -1334,7 +1334,4 @@
<Target Name="AfterBuild">
</Target>
-->
diff --git a/debian/patches/use-installed-ico-files.patch b/debian/patches/use-installed-ico-files.patch
index 72c6b09..f06c0ce 100644
--- a/debian/patches/use-installed-ico-files.patch
+++ b/debian/patches/use-installed-ico-files.patch
@@ -59,12 +59,12 @@ Forwarded: not-needed
48 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
-index 57edb52..193ecdc 100644
+index ac0f166..57c0a4d 100644
--- a/KeePass/Forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
-@@ -56,11 +56,11 @@ namespace KeePass.Forms
- string strTitle = PwDefs.ProductName;
+@@ -57,11 +57,11 @@ namespace KeePass.Forms
string strDesc = KPRes.Version + " " + PwDefs.VersionString;
+ if(Program.IsDevelopmentSnapshot()) strDesc += " (Dev)";
- Icon icoNew = new Icon(Properties.Resources.KeePass, 48, 48);
+ Icon icoNew = new Icon(new Icon("/usr/share/keepass2/KeePass.ico"), 48, 48);
@@ -77,12 +77,12 @@ index 57edb52..193ecdc 100644
m_lvComponents.Columns.Add(KPRes.Component, 100, HorizontalAlignment.Left);
m_lvComponents.Columns.Add(KPRes.Status + " / " + KPRes.Version, 100,
diff --git a/KeePass/Forms/AutoTypeCtxForm.cs b/KeePass/Forms/AutoTypeCtxForm.cs
-index c62955c..26ec71a 100644
+index 27e83c8..fc447d3 100644
--- a/KeePass/Forms/AutoTypeCtxForm.cs
+++ b/KeePass/Forms/AutoTypeCtxForm.cs
@@ -76,7 +76,7 @@ namespace KeePass.Forms
- m_lblText.Text = KPRes.AutoTypeEntrySelectionDescLong;
+ m_lblText.Text = KPRes.AutoTypeEntrySelectionDescLong2;
this.Text = KPRes.AutoTypeEntrySelection;
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
@@ -116,12 +116,12 @@ index ea3339e..f8adb6a 100644
float fWidth = (float)(m_lvColumns.ClientRectangle.Width -
diff --git a/KeePass/Forms/CsvImportForm.cs b/KeePass/Forms/CsvImportForm.cs
-index eec83d1..feaa044 100644
+index cd239ba..f7b6503 100644
--- a/KeePass/Forms/CsvImportForm.cs
+++ b/KeePass/Forms/CsvImportForm.cs
-@@ -109,7 +109,7 @@ namespace KeePass.Forms
-
- GlobalWindowManager.AddWindow(this);
+@@ -112,7 +112,7 @@ namespace KeePass.Forms
+ // Callable from KPScript without parent form
+ Debug.Assert(this.StartPosition == FormStartPosition.CenterScreen);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
@@ -259,7 +259,7 @@ index 6733641..1d5c281 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 ab39b11..2e79f63 100644
+index 632488c..dc1d486 100644
--- a/KeePass/Forms/EditAutoTypeItemForm.cs
+++ b/KeePass/Forms/EditAutoTypeItemForm.cs
@@ -106,7 +106,7 @@ namespace KeePass.Forms
@@ -272,7 +272,7 @@ index ab39b11..2e79f63 100644
// FontUtil.AssignDefaultBold(m_lblTargetWindow);
// FontUtil.AssignDefaultBold(m_rbSeqDefault);
diff --git a/KeePass/Forms/EditStringForm.cs b/KeePass/Forms/EditStringForm.cs
-index 0721b55..01c4b60 100644
+index 4cbc725..e5e249f 100644
--- a/KeePass/Forms/EditStringForm.cs
+++ b/KeePass/Forms/EditStringForm.cs
@@ -97,7 +97,7 @@ namespace KeePass.Forms
@@ -389,10 +389,10 @@ index 92051df..1302061 100644
FontUtil.AssignDefaultBold(m_radioLocal);
diff --git a/KeePass/Forms/IOConnectionForm.cs b/KeePass/Forms/IOConnectionForm.cs
-index 2878082..7463e83 100644
+index 31c15e8..7bbf053 100644
--- a/KeePass/Forms/IOConnectionForm.cs
+++ b/KeePass/Forms/IOConnectionForm.cs
-@@ -75,7 +75,7 @@ namespace KeePass.Forms
+@@ -85,7 +85,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
KeePass.Properties.Resources.B48x48_WWW, strTitle, strDesc);
@@ -467,7 +467,7 @@ index 96aaa23..b2a0e4f 100644
FontUtil.SetDefaultFont(m_cbPassword);
FontUtil.AssignDefaultBold(m_cbPassword);
diff --git a/KeePass/Forms/LanguageForm.cs b/KeePass/Forms/LanguageForm.cs
-index c0fdbc9..fa105a3 100644
+index c71371b..e495c57 100644
--- a/KeePass/Forms/LanguageForm.cs
+++ b/KeePass/Forms/LanguageForm.cs
@@ -58,7 +58,7 @@ namespace KeePass.Forms
@@ -480,7 +480,7 @@ index c0fdbc9..fa105a3 100644
List<Image> lImg = new List<Image>();
diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs
-index 46f8f7f..51852e6 100644
+index 134a78b..79ba65e 100644
--- a/KeePass/Forms/MainForm.cs
+++ b/KeePass/Forms/MainForm.cs
@@ -140,7 +140,7 @@ namespace KeePass.Forms
@@ -493,10 +493,10 @@ index 46f8f7f..51852e6 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 d49c901..8e4f2e3 100644
+index 7018aa8..3fe4149 100644
--- a/KeePass/Forms/MainForm_Functions.cs
+++ b/KeePass/Forms/MainForm_Functions.cs
-@@ -425,18 +425,18 @@ namespace KeePass.Forms
+@@ -435,18 +435,18 @@ namespace KeePass.Forms
strNtfText = strNtfPre + strFileDesc;
Icon icoDisposable, icoAssignable;
@@ -518,7 +518,7 @@ index d49c901..8e4f2e3 100644
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -459,7 +459,7 @@ namespace KeePass.Forms
+@@ -469,7 +469,7 @@ namespace KeePass.Forms
m_docMgr.ActiveDatabase.IOConnectionInfo.Path, 63 - strNtfPre.Length);
Icon icoDisposable, icoAssignable;
@@ -527,7 +527,7 @@ index d49c901..8e4f2e3 100644
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -484,7 +484,7 @@ namespace KeePass.Forms
+@@ -494,7 +494,7 @@ namespace KeePass.Forms
m_ntfTray.Text = StrUtil.CompactString3Dots(strNtfText, 63);
Icon icoToDispose, icoToAssign;
@@ -536,7 +536,7 @@ index d49c901..8e4f2e3 100644
ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
this.Icon = icoToAssign;
if(icoToDispose != null) icoToDispose.Dispose();
-@@ -2675,12 +2675,12 @@ namespace KeePass.Forms
+@@ -2727,12 +2727,12 @@ namespace KeePass.Forms
}
else if(m.Msg == DwmUtil.WM_DWMSENDICONICTHUMBNAIL)
{
@@ -551,7 +551,7 @@ index d49c901..8e4f2e3 100644
return;
}
-@@ -3781,7 +3781,7 @@ namespace KeePass.Forms
+@@ -3833,7 +3833,7 @@ namespace KeePass.Forms
// wasn't fully constructed at that time yet)
// if(IsFileLocked(null))
// TaskbarList.SetOverlayIcon(this,
@@ -561,7 +561,7 @@ index d49c901..8e4f2e3 100644
if(Program.Config.MainWindow.MinimizeToTray) MinimizeToTray(true);
diff --git a/KeePass/Forms/OptionsForm.cs b/KeePass/Forms/OptionsForm.cs
-index d1c8290..45e3f7f 100644
+index daac41f..4bb512c 100644
--- a/KeePass/Forms/OptionsForm.cs
+++ b/KeePass/Forms/OptionsForm.cs
@@ -119,7 +119,7 @@ namespace KeePass.Forms
@@ -587,10 +587,10 @@ index 0f8570f..825198a 100644
m_cbCacheDeleteOld.Checked = Program.Config.Application.Start.PluginCacheDeleteOld;
diff --git a/KeePass/Forms/PrintForm.cs b/KeePass/Forms/PrintForm.cs
-index 7b179d8..f313346 100644
+index 01e6bec..2ae5f54 100644
--- a/KeePass/Forms/PrintForm.cs
+++ b/KeePass/Forms/PrintForm.cs
-@@ -99,7 +99,7 @@ namespace KeePass.Forms
+@@ -100,7 +100,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -639,7 +639,7 @@ index 1b365d3..b189385 100644
UIUtil.SetButtonImage(m_btnProfileAdd,
Properties.Resources.B16x16_FileSaveAs, false);
diff --git a/KeePass/Forms/SearchForm.cs b/KeePass/Forms/SearchForm.cs
-index 2869567..c7efa5d 100644
+index 47d490b..3ab1d47 100644
--- a/KeePass/Forms/SearchForm.cs
+++ b/KeePass/Forms/SearchForm.cs
@@ -92,7 +92,7 @@ namespace KeePass.Forms
diff --git a/debian/patches/use-the-mono-signing-key.patch b/debian/patches/use-the-mono-signing-key.patch
index f8ba1ee..4796207 100644
--- a/debian/patches/use-the-mono-signing-key.patch
+++ b/debian/patches/use-the-mono-signing-key.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index afc8b54..021ae11 100644
+index 024e044..cab8d44 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
@@ -11,7 +11,7 @@
@@ -22,7 +22,7 @@ index afc8b54..021ae11 100644
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
diff --git a/KeePassLib/KeePassLib.csproj b/KeePassLib/KeePassLib.csproj
-index a59d90a..0a30ef8 100644
+index 2f7a653..9f6151a 100644
--- a/KeePassLib/KeePassLib.csproj
+++ b/KeePassLib/KeePassLib.csproj
@@ -10,7 +10,7 @@
--
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