Upgrade to 0.4.3 base on merge from mainstream branch
authorYves Martin <ymartin59@free.fr>
Sun, 23 Jan 2011 17:29:42 +0000 (18:29 +0100)
committerYves Martin <ymartin59@free.fr>
Sun, 23 Jan 2011 17:29:42 +0000 (18:29 +0100)
15 files changed:
.gitignore [new file with mode: 0644]
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/files [new file with mode: 0644]
debian/keepass.1 [new file with mode: 0644]
debian/keepassx.postinst.debhelper [new file with mode: 0644]
debian/keepassx.postrm.debhelper [new file with mode: 0644]
debian/keepassx.substvars [new file with mode: 0644]
debian/patches/00list [new file with mode: 0644]
debian/patches/10_RemoveSystray.dpatch [new file with mode: 0755]
debian/patches/20_LargeIcons.dpatch [new file with mode: 0755]
debian/patches/30_Paths.dpatch [new file with mode: 0755]
debian/rules [new file with mode: 0755]

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..ce5bb98
--- /dev/null
@@ -0,0 +1,7 @@
+Makefile
+src/Makefile
+build/
+bin/
+debian/patched/
+debian/keepassx/
+build-stamp
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..004246e
--- /dev/null
@@ -0,0 +1,49 @@
+keepassx (0.4.3-1maemo) unstable; urgency=low
+
+  * Upgrade to 0.4.3
+
+ -- Yves Martin <ymartin59@free.fr>  Wed, 29 Dec 2010 19:35:00 +0100
+
+keepassx (0.4.1) unstable; urgency=low
+
+  * Bumped to 0.4.1
+
+ -- Timothy Redaelli <timothy@redaelli.eu>  Mon, 14 Dec 2009 18:13:01 +0100
+
+keepassx (0.2.2-3osso) unstable; urgency=low
+
+  * Add Maximize button support - Mark Bergman patch (  bergman@merctech.com ) 
+  * Set Large Fonts -  Mark Bergman patch (  bergman@merctech.com )
+  * Correct some package Bugs
+
+ -- Antonio Aloisio <gnuton@gnuton.org>  Tue, 11 Mar 2008 20:20:13 +0100
+
+keepassx (0.2.2-2osso) unstable; urgency=low
+
+  * Imported to maemo Qt4 repository 
+
+ -- Antonio Aloisio <gnuton@gnuton.org>  Fri, 28 Dic 2007 00:07:08 +0100
+
+keepassx (0.2.2-2) unstable; urgency=low
+
+  * Upload to unstable
+  * Fix typo in package description. Thanks to Stefan Fritsch!
+  * Translate desktop file
+
+ -- Reinhard Tartler <siretart@tauware.de>  Sat, 10 Feb 2007 17:15:55 +0100
+
+keepassx (0.2.2-1) experimental; urgency=low
+
+  * cleanups to debian/rules
+  * upload to debian/experimental for now (Closes: #405896)
+  * small changes to description
+  * remove libstdc++6-4.0-dev from build-depends
+
+ -- Reinhard Tartler <siretart@tauware.de>  Mon,  8 Jan 2007 17:59:13 +0100
+
+keepassx (0.2.2-0ubuntu1) edgy; urgency=low
+
+  * Initial release
+
+ -- David Valot <ptitdav69@gmail.com>  Wed,  6 Sep 2006 21:07:02 +0200
+
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7ed6ff8
--- /dev/null
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..9e2efa8
--- /dev/null
@@ -0,0 +1,61 @@
+Source: keepassx
+Section: user/utilities
+Priority: optional
+Maintainer: Timothy Redaelli <timothy@redaelli.eu>
+Maintainer: Timothy Redaelli <timothy@redaelli.eu>
+Build-Depends: debhelper (>= 5.0.0), libqt4-dev, libpng12-dev, libxtst-dev, libxi-dev
+Standards-Version: 3.7.2
+
+Package: keepassx
+Architecture: any
+Depends: ${shlibs:Depends}
+XB-Maemo-Icon-26:
+ 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
+ SUVORK5CYII=
+Description: Cross Platform Password Manager
+ KeePassX is a free/open-source password manager or safe which helps you
+ to manage your passwords in a secure way. You can put all your
+ passwords in one database, which is locked with one master key or a
+ key-disk. So you only have to remember one single master password or
+ insert the key-disk to unlock the whole database. The databases are
+ encrypted using the algorithms AES or Twofish.
+ .
+  Homepage: http://keepassx.sourceforge.net
+  Keepass for maemo homepage: http://qt4.garage.maemo.org
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..d840d8a
--- /dev/null
@@ -0,0 +1,161 @@
+This package was debianized by David Valot <ptitdav69@gmail.com> on
+Wed,  6 Sep 2006 21:07:02 +0200.
+
+It was downloaded from http://keepassx.sourceforge.net
+
+Upstream Author: Tarek Saidi <mail@tarek-saidi.de>
+
+Copyright: 2006 Tarek Saidi
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2006, David Valot <ptitdav69@gmail.com> and
+(C) 2007, Reinhard Tartler <siretart@tauware.de>. It is licensed under
+the GPL, see above.
+
+The directory src/crypto contains implementations of several crypto
+algorithms, which have other licences and/or copyright holders:
+
+src/crypto/blowfish.c:
+
+/* 2003.05.02: Derived from libgcrypt-1.1.12 by Michael Buesch */
+
+/* blowfish.c  -  Blowfish encryption
+ *     Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser general Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ ...
+ */
+
+
+src/crypto/rijandael.cpp:
+
+// Another implementation of the Rijndael cipher.
+// This is intended to be an easily usable library file.
+// This code is public domain.
+// Based on the Vincent Rijmen and K.U.Leuven implementation 2.4.
+//
+
+//
+// Original Copyright notice:
+//
+//    rijndael-alg-fst.c   v2.4   April '2000
+//    rijndael-alg-fst.h
+//    rijndael-api-fst.c
+//    rijndael-api-fst.h
+//
+//    Optimised ANSI C code
+//
+//    authors: v1.0: Antoon Bosselaers
+//             v2.0: Vincent Rijmen, K.U.Leuven
+//             v2.3: Paulo Barreto
+//             v2.4: Vincent Rijmen, K.U.Leuven
+//
+//    This code is placed in the public domain.
+//
+
+src/crypto/sha1.cpp:
+/*
+       100% free public domain implementation of the SHA-1 algorithm
+       by Dominik Reichl <dominik.reichl@t-online.de>
+...
+*/
+
+src/crypto/sha256.c:
+
+/*
+ *  FIPS-180-2 compliant SHA-256 implementation
+ *
+ *  Copyright (C) 2001-2003  Christophe Devine
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ ...
+ */
+
+src/crypto/twoclass.cpp:
+
+/*
+  Copyright (c) 2003/2004, Dominik Reichl <dominik.reichl@t-online.de>
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+  - Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer. 
+  - Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+  - Neither the name of ReichlSoft nor the names of its contributors may be
+    used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+*/
+
+src/crypto/twofish.cpp:
+
+ * Fast, portable, and easy-to-use Twofish implementation, 
+ * Version 0.3.
+ * Copyright (c) 2002 by Niels Ferguson. 
+
+ * Now for the license:
+ * The author hereby grants a perpetual license to everybody to
+ * use this code for any purpose as long as the copyright message is included
+ * in the source code of this or any derived work.
+ * 
+ * Yes, this means that you, your company, your club, and anyone else
+ * can use this code anywhere you want. You can change it and distribute it
+ * under the GPL, include it in your commercial product without releasing
+ * the source code, put it on the web, etc. 
+ * The only thing you cannot do is remove my copyright message, 
+ * or distribute any source code based on this implementation that does not 
+ * include my copyright message. 
+ * 
+ * I appreciate a mention in the documentation or credits, 
+ * but I understand if that is difficult to do.
+ * I also appreciate it if you tell me where and why you used my code.
+ *
+ * Please send any questions or comments to niels@ferguson.net
+
+ * DISCLAIMER: As I'm giving away my work for free, I'm of course not going
+ * to accept any liability of any form. This code, or the Twofish cipher,
+ * might very well be flawed; you have been warned.
+ * This software is provided as-is, without any kind of warrenty or
+ * guarantee. And that is really all you can expect when you download 
+ * code for free from the Internet. 
diff --git a/debian/files b/debian/files
new file mode 100644 (file)
index 0000000..6033dae
--- /dev/null
@@ -0,0 +1 @@
+keepassx_0.4.3-1maemo_i386.deb user/utilities optional
diff --git a/debian/keepass.1 b/debian/keepass.1
new file mode 100644 (file)
index 0000000..1b211e4
--- /dev/null
@@ -0,0 +1,12 @@
+.TH KEEPASSX 1 "Sep 04, 2006"
+.SH NAME
+keepassx \- password manager
+.SH SYNOPSIS
+.B keepassx
+.RI [ files/filelist ]
+.SH DESCRIPTION
+\fBKeePassX\fP is a free/open-source password manager or safe which helps you to manage your passwords in a secure way. You can put all your passwords in one database, which is locked with one master key or a key-disk. So you only have to remember one single master password or insert the key-disk to unlock the whole database. The databases are encrypted using the best and most secure encryption algorithms currently known (AES and Twofish).
+.SH COMMANDS
+.SH AUTHOR
+This manual page was written by David Valot <ptitdav69@gmail.com>,
+for the Debian project (but may be used by others).
diff --git a/debian/keepassx.postinst.debhelper b/debian/keepassx.postinst.debhelper
new file mode 100644 (file)
index 0000000..7419e50
--- /dev/null
@@ -0,0 +1,5 @@
+# Automatically added by dh_desktop
+if [ "$1" = "configure" ] && which update-desktop-database >/dev/null 2>&1 ; then
+       update-desktop-database -q
+fi
+# End automatically added section
diff --git a/debian/keepassx.postrm.debhelper b/debian/keepassx.postrm.debhelper
new file mode 100644 (file)
index 0000000..33e6455
--- /dev/null
@@ -0,0 +1,5 @@
+# Automatically added by dh_desktop
+if [ "$1" = "remove" ] && which update-desktop-database >/dev/null 2>&1 ; then
+       update-desktop-database -q
+fi
+# End automatically added section
diff --git a/debian/keepassx.substvars b/debian/keepassx.substvars
new file mode 100644 (file)
index 0000000..ed90318
--- /dev/null
@@ -0,0 +1 @@
+shlibs:Depends=libc6 (>= 2.5.0-1), libgcc1 (>= 1:4.2.1), libqt4-core (>= 4.7.0~git20100909), libqt4-gui (>= 4.7.0~git20100909), libqt4-xml (>= 4.7.0~git20100909), libstdc++6 (>= 4.2.1)
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644 (file)
index 0000000..9a044e5
--- /dev/null
@@ -0,0 +1,3 @@
+10_RemoveSystray.dpatch
+20_LargeIcons.dpatch
+30_Paths.dpatch
diff --git a/debian/patches/10_RemoveSystray.dpatch b/debian/patches/10_RemoveSystray.dpatch
new file mode 100755 (executable)
index 0000000..04ecd35
--- /dev/null
@@ -0,0 +1,157 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_RemoveSystray.dpatch by  <yma@>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad keepassx-0.4.3~/src/main.cpp keepassx-0.4.3/src/main.cpp
+--- keepassx-0.4.3~/src/main.cpp       2010-12-30 00:32:17.000000000 +0100
++++ keepassx-0.4.3/src/main.cpp        2010-12-30 00:50:22.000000000 +0100
+@@ -56,6 +56,13 @@
+ #else
+       QApplication* app = new QApplication(argc,argv);
+ #endif
++
++#ifdef Q_WS_HILDON
++      QFont font = app->font();
++      font.setPointSize( font.pointSize()-4 );
++      app->setFont( font );
++#endif
++      
+       EventListener* eventListener = new EventListener();
+       app->installEventFilter(eventListener);
+       
+diff -urNad keepassx-0.4.3~/src/mainwindow.cpp keepassx-0.4.3/src/mainwindow.cpp
+--- keepassx-0.4.3~/src/mainwindow.cpp 2010-12-30 00:32:17.000000000 +0100
++++ keepassx-0.4.3/src/mainwindow.cpp  2010-12-30 00:50:22.000000000 +0100
+@@ -73,7 +73,9 @@
+               restoreGeometry(windowGeo);
+       VSplitter->restoreState(config->vSplitterPos());
+       HSplitter->restoreState(config->hSplitterPos());
++#ifndef       Q_WS_HILDON
+       SysTray=new QSystemTrayIcon(this);
++#endif
+       setupToolbar();
+       setupIcons();
+       setStateFileOpen(false);
+@@ -211,7 +213,9 @@
+       connect(EntryView, SIGNAL(viewModeChanged(bool)), SLOT(loadColumnVisibility()));
+       connect(EntryView, SIGNAL(viewModeChanged(bool)), ViewColumnsGroupAction, SLOT(setVisible(bool)));
++#ifndef Q_WS_HILDON
+       connect(SysTray,SIGNAL(activated(QSystemTrayIcon::ActivationReason)),this,SLOT(OnSysTrayActivated(QSystemTrayIcon::ActivationReason)));
++#endif
+       connect(DetailView,SIGNAL(anchorClicked(const QUrl&)),this,SLOT(OnDetailViewUrlClicked(const QUrl&)));
+       connect(WorkspaceLockedWidget.Button_Unlock,SIGNAL(clicked()),this,SLOT(OnUnLockWorkspace()));
+       connect(WorkspaceLockedWidget.Button_CloseDatabase,SIGNAL(clicked()),this,SLOT(OnLockClose()));
+@@ -282,9 +286,11 @@
+       AddThisAsBookmarkAction->setIcon(getIcon("bookmark_this"));
+       AddBookmarkAction->setIcon(getIcon("bookmark_add"));
+       ManageBookmarksAction->setIcon(getIcon("bookmark"));
++#ifndef Q_WS_HILDON
+       SysTray->setIcon(getIcon("keepassx"));
+       if(config->showSysTrayIcon())
+               SysTray->show();
++#endif
+ }
+ void KeepassMainWindow::setupMenus(){
+@@ -336,9 +342,11 @@
+       SysTrayMenu->addAction(FileUnLockWorkspaceAction);
+       SysTrayMenu->addSeparator();
+       SysTrayMenu->addAction(FileExitAction);
++#ifndef Q_WS_HILDON
+       SysTray->setContextMenu(SysTrayMenu);
+       updateTrayTooltip();
+-
++#endif
++      
+       #define _add_import(name){\
+       QAction* import=new QAction(this);\
+       import->setData(qVariantFromValue(dynamic_cast<QObject*>(&name)));\
+@@ -1102,7 +1110,9 @@
+               config->setHSplitterPos(HSplitter->saveState());
+       config->setShowStatusbar(statusBar()->isVisible());
+       
++#ifndef Q_WS_HILDON
+       delete SysTray;
++#endif
+       QMainWindow::closeEvent(e);
+       QApplication::quit();
+ }
+@@ -1153,7 +1163,9 @@
+       }
+       
+       EntryView->setAlternatingRowColors(config->alternatingRowColors());
++#ifndef Q_WS_HILDON
+       SysTray->setVisible(config->showSysTrayIcon());
++#endif
+       menuBookmarks->menuAction()->setVisible(config->featureBookmarks());
+ #ifndef Q_WS_MAC
+       if (config->alwaysOnTop() != oldAlwaysOnTop) {
+@@ -1245,6 +1257,7 @@
+       toolBar->setIconSize(QSize(28,28));
+ }
++#ifndef Q_WS_HILDON
+ void KeepassMainWindow::OnSysTrayActivated(QSystemTrayIcon::ActivationReason reason){
+       if(reason!=QSystemTrayIcon::Context){
+               if (isVisible()){
+@@ -1263,6 +1276,7 @@
+               }
+       }
+ }
++#endif
+ void KeepassMainWindow::restoreWindow(){
+ #ifdef Q_WS_WIN
+@@ -1371,7 +1385,9 @@
+       NormalCentralWidget->setParent(NULL);
+       setCentralWidget(LockedCentralWidget);
+       LockedCentralWidget->setVisible(true);
++#ifndef Q_WS_HILDON
+       SysTray->setIcon(getIcon("keepassx_locked"));
++#endif
+       FileUnLockWorkspaceAction->setText(tr("Un&lock Workspace"));
+       IsLocked=true;
+       updateTrayTooltip();
+@@ -1386,7 +1402,9 @@
+       LockedCentralWidget->setParent(NULL);
+       setCentralWidget(NormalCentralWidget);
+       NormalCentralWidget->setVisible(true);
++#ifndef Q_WS_HILDON
+       SysTray->setIcon(getIcon("keepassx"));
++#endif
+       FileUnLockWorkspaceAction->setText(tr("&Lock Workspace"));
+       IsLocked=false;
+       updateTrayTooltip();
+@@ -1510,6 +1528,7 @@
+ }
+ void KeepassMainWindow::updateTrayTooltip() {
++#ifndef Q_WS_HILDON
+       if (!IsLocked && !FileOpen)
+               SysTray->setToolTip(QString("%1 - %2").arg(APP_DISPLAY_NAME, APP_SHORT_FUNC));
+       else {
+@@ -1519,6 +1538,7 @@
+                       tooltip.append( QString(" (%1)").arg(tr("locked")) );
+               SysTray->setToolTip(tooltip);
+       }
++#endif
+ }
+ void KeepassMainWindow::updateCurrentFile(const QString& filePath) {
+diff -urNad keepassx-0.4.3~/src/mainwindow.h keepassx-0.4.3/src/mainwindow.h
+--- keepassx-0.4.3~/src/mainwindow.h   2010-12-30 00:32:17.000000000 +0100
++++ keepassx-0.4.3/src/mainwindow.h    2010-12-30 00:50:22.000000000 +0100
+@@ -129,7 +129,9 @@
+               QLabel* StatusBarGeneral;
+               //QLabel* StatusBarSelection;
+               QToolBar* toolBar;
++#ifndef Q_WS_HILDON
+               QSystemTrayIcon* SysTray;
++#endif
+               QAction* ViewShowToolbarAction;
+               QMenu* SysTrayMenu;
+               //QAssistantClient* HelpBrowser; //TODO HelpBrowser
diff --git a/debian/patches/20_LargeIcons.dpatch b/debian/patches/20_LargeIcons.dpatch
new file mode 100755 (executable)
index 0000000..505e803
--- /dev/null
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_LargeIcons.dpatch by  <yma@>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad keepassx-0.4.3~/src/KpxConfig.h keepassx-0.4.3/src/KpxConfig.h
+--- keepassx-0.4.3~/src/KpxConfig.h    2010-12-30 00:29:54.000000000 +0100
++++ keepassx-0.4.3/src/KpxConfig.h     2010-12-30 00:48:40.000000000 +0100
+@@ -100,7 +100,7 @@
+       bool showStatusbar(){return settings.value("UI/ShowStatusbar",true).toBool();}
+       bool showSysTrayIcon(){return settings.value("Options/ShowSysTrayIcon",false).toBool();}
+       bool showToolbar(){return settings.value("UI/ShowToolbar",true).toBool();}
+-      int toolbarIconSize(){return settings.value("UI/ToolbarIconSize",16).toInt();}
++      int toolbarIconSize(){return settings.value("UI/ToolbarIconSize",28).toInt();}
+       QString urlCmd(){return settings.value("Options/UrlCmd").toString();}
+       bool urlCmdDef(){return settings.value("Options/UrlCmdDef",true).toBool();}
+       QByteArray vSplitterPos(){return settings.value("UI/VSplitterPos").toByteArray();}
diff --git a/debian/patches/30_Paths.dpatch b/debian/patches/30_Paths.dpatch
new file mode 100755 (executable)
index 0000000..4c9e3b9
--- /dev/null
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_Paths.dpatch by  <yma@>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad keepassx-0.4.3~/src/src.pro keepassx-0.4.3/src/src.pro
+--- keepassx-0.4.3~/src/src.pro        2010-12-30 00:36:17.000000000 +0100
++++ keepassx-0.4.3/src/src.pro 2010-12-30 00:40:16.000000000 +0100
+@@ -52,7 +52,7 @@
+       datalicense.path = $${PREFIX}/share/keepassx
+       
+       shareapp.files = ../share/applications/*.desktop
+-      shareapp.path = $${PREFIX}/share/applications
++      shareapp.path = $${PREFIX}/share/applications/hildon
+       shararemime.files = ../share/mime/packages/*.xml
+       shararemime.path = $${PREFIX}/share/mime/packages
+       sharemimelnk.files = ../share/mimelnk/application/*.desktop
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..8d1bd14
--- /dev/null
@@ -0,0 +1,73 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# Include dpatch stuff.
+# include /usr/share/dpatch/dpatch.make
+
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+       CFLAGS += -O0
+else
+       CFLAGS += -O2
+endif
+
+build: patch build-stamp
+build-stamp: 
+       dh_testdir
+       #/opt/qt4-maemo5/bin/
+       qmake-qt4 PREFIX=/usr QMAKE_CFLAGS_DEBUG="$(CFLAGS)" QMAKE_CXXFLAGS_DEBUG="$(CFLAGS)" DEBUG=1 AUTOTYPE=0
+       $(MAKE)
+       touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp configure-stamp
+       -$(MAKE) distclean
+       rm -rf src/Makefile Makefile
+       dh_clean 
+
+install: build
+       dh_testdir
+       dh_testroot
+       dh_clean -k 
+       dh_installdirs
+       make INSTALL_ROOT=$(CURDIR)/debian/keepassx install
+
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs changelog
+       dh_installdocs
+       dh_installexamples
+       dh_installman debian/keepass.1
+       dh_desktop
+       dh_link
+       dh_strip
+       dh_compress
+       dh_fixperms
+       dh_installdeb
+       dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+patch: patch-stamp
+
+patch-stamp:
+       dpatch apply-all
+
+unpatch:
+       dpatch deapply-all
+       rm -rf debian/patched
+
+binary: binary-indep binary-arch
+.PHONY: build build-stamp clean clean-patched install binary-indep binary-arch binary patch patch-stamp unpatch binary