tags 417437 + patch thanks Hi,
Attached is the diff for my mypasswordsafe 0.0.20050615-2.1 NMU. There's still some cleanup in the doc-base part of things, but I leave that to you for now. Cheers, -- ----------------------------------------------------------------- | ,''`. Stephen Gran | | : :' : [EMAIL PROTECTED] | | `. `' Debian user, admin, and developer | | `- http://www.debian.org | -----------------------------------------------------------------
diff -u mypasswordsafe-0.0.20050615/src/safeserializer.cpp mypasswordsafe-0.0.20050615/src/safeserializer.cpp
--- mypasswordsafe-0.0.20050615/src/safeserializer.cpp
+++ mypasswordsafe-0.0.20050615/src/safeserializer.cpp
@@ -22,6 +22,7 @@
#include "plaintextlizer.hpp"
#include "serializers.hpp"
#include "xmlserializer.hpp"
+#include <algorithm>
using namespace std;
diff -u mypasswordsafe-0.0.20050615/Makefile mypasswordsafe-0.0.20050615/Makefile
--- mypasswordsafe-0.0.20050615/Makefile
+++ mypasswordsafe-0.0.20050615/Makefile
@@ -54,10 +54,11 @@
config: src/config.h
clean: MyPasswordSafe.mak
- ${MAKE} -f $< clean
+ ${MAKE} -f $< distclean
${MAKE} -C uuid-1.0.0 clean
rm $<
- rm -r doc/api
+ rm -rf doc/api
+ rm -f locale/*.qm
install:
install -d $(PREFIX)/bin $(PREFIX)/share/MyPasswordSafe/locale \
diff -u mypasswordsafe-0.0.20050615/debian/rules mypasswordsafe-0.0.20050615/debian/rules
--- mypasswordsafe-0.0.20050615/debian/rules
+++ mypasswordsafe-0.0.20050615/debian/rules
@@ -42,11 +42,14 @@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) clean
-
+ifeq (Makefile,$(wildcard Makefile))
+ $(MAKE) clean
+endif
+
+ rm -f build-stamp configure-stamp uuid-1.0.0/config.status
+ rm -f uuid-1.0.0/config.log uuid-1.0.0/uuid-config uuid-1.0.0/Makefile uuid-1.0.0/libtool
# The files below are automatically created by qmake in the clean rule
# Remove them, otherwise the build breaks with rootcmd = sudo
rm -rf .ui .moc .obj
diff -u mypasswordsafe-0.0.20050615/debian/changelog mypasswordsafe-0.0.20050615/debian/changelog
--- mypasswordsafe-0.0.20050615/debian/changelog
+++ mypasswordsafe-0.0.20050615/debian/changelog
@@ -1,3 +1,15 @@
+mypasswordsafe (0.0.20050615-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gcc-4.3 (closes: #417437)
+ * Some lintian induced cleanup:
+ - Stop ignoring errors in clean target
+ - Remove a few more files in clean
+ - Move Homepage to control field
+ * Update Standards-Version (no changes)
+
+ -- Stephen Gran <[EMAIL PROTECTED]> Sat, 05 Apr 2008 20:14:33 +0100
+
mypasswordsafe (0.0.20050615-2) unstable; urgency=low
* New maintainer. (Closes: 378540).
diff -u mypasswordsafe-0.0.20050615/debian/control mypasswordsafe-0.0.20050615/debian/control
--- mypasswordsafe-0.0.20050615/debian/control
+++ mypasswordsafe-0.0.20050615/debian/control
@@ -3,7 +3,8 @@
Priority: optional
Maintainer: Felipe Augusto van de Wiel (faw) <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 4.0.0), libboost-dev, libqt3-mt-dev, qt3-dev-tools
-Standards-Version: 3.6.2
+Standards-Version: 3.7.3
+Homepage: http://www.semanticgap.com/myps/
Package: mypasswordsafe
Architecture: any
@@ -26,2 +26,0 @@
- .
- Homepage: http://www.semanticgap.com/myps/
only in patch2:
unchanged:
--- mypasswordsafe-0.0.20050615.orig/src/crypto/bfproxy.cpp
+++ mypasswordsafe-0.0.20050615/src/crypto/bfproxy.cpp
@@ -17,6 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "bfproxy.hpp"
+#include <cstring>
BFProxy::BFProxy(const unsigned char *key, int len)
{
only in patch2:
unchanged:
--- mypasswordsafe-0.0.20050615.orig/src/encryptedstring.cpp
+++ mypasswordsafe-0.0.20050615/src/encryptedstring.cpp
@@ -22,6 +22,8 @@
#include "crypto/sha1.h"
#include "securedstring.hpp"
#include "encryptedstring.hpp"
+#include <cstring>
+#include <cstdlib>
using namespace std;
only in patch2:
unchanged:
--- mypasswordsafe-0.0.20050615.orig/src/pwsafe/Util.h
+++ mypasswordsafe-0.0.20050615/src/pwsafe/Util.h
@@ -11,6 +11,7 @@
#include <string>
using std::string;
+#include <cstring>
#include "PW_sha1.h"
#include "PwsPlatform.h"
#include "myutil.hpp"
only in patch2:
unchanged:
--- mypasswordsafe-0.0.20050615.orig/src/pwsafe/Util.cpp
+++ mypasswordsafe-0.0.20050615/src/pwsafe/Util.cpp
@@ -6,6 +6,8 @@
//#include "PwsPlatform.h"
#include <stdio.h>
+#include <limits.h>
+#include <cstdlib>
#include <iostream>
using std::cout;
using std::endl;
only in patch2:
unchanged:
--- mypasswordsafe-0.0.20050615.orig/src/safe.hpp
+++ mypasswordsafe-0.0.20050615/src/safe.hpp
@@ -128,7 +128,7 @@
SafeEntry(SafeGroup *parent);
SafeEntry(SafeGroup *parent,
const QString &n, const QString &u,
- const EncryptedString &p, const QString &n);
+ const EncryptedString &p, const QString &z);
SafeEntry(const SafeEntry &item);
~SafeEntry();
signature.asc
Description: Digital signature
