From: Yves Martin Date: Sun, 23 Jan 2011 17:29:42 +0000 (+0100) Subject: Upgrade to 0.4.3 base on merge from mainstream branch X-Git-Url: http://git.maemo.org/git/?p=keepassx;a=commitdiff_plain;h=e41ebe7b414aaeafbc55d2f6efd234c40a76d01d Upgrade to 0.4.3 base on merge from mainstream branch --- e41ebe7b414aaeafbc55d2f6efd234c40a76d01d diff --cc .gitignore index 0000000,0000000..ce5bb98 new file mode 100644 --- /dev/null +++ b/.gitignore @@@ -1,0 -1,0 +1,7 @@@ ++Makefile ++src/Makefile ++build/ ++bin/ ++debian/patched/ ++debian/keepassx/ ++build-stamp diff --cc debian/changelog index 1e237f1,0000000..004246e mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,43 -1,0 +1,49 @@@ ++keepassx (0.4.3-1maemo) unstable; urgency=low ++ ++ * Upgrade to 0.4.3 ++ ++ -- Yves Martin Wed, 29 Dec 2010 19:35:00 +0100 ++ +keepassx (0.4.1) unstable; urgency=low + + * Bumped to 0.4.1 + + -- Timothy Redaelli 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 Tue, 11 Mar 2008 20:20:13 +0100 + +keepassx (0.2.2-2osso) unstable; urgency=low + + * Imported to maemo Qt4 repository + + -- Antonio Aloisio 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 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 Mon, 8 Jan 2007 17:59:13 +0100 + +keepassx (0.2.2-0ubuntu1) edgy; urgency=low + + * Initial release + + -- David Valot Wed, 6 Sep 2006 21:07:02 +0200 + diff --cc debian/files index 0000000,0000000..6033dae new file mode 100644 --- /dev/null +++ b/debian/files @@@ -1,0 -1,0 +1,1 @@@ ++keepassx_0.4.3-1maemo_i386.deb user/utilities optional diff --cc debian/keepassx.postinst.debhelper index 0000000,0000000..7419e50 new file mode 100644 --- /dev/null +++ b/debian/keepassx.postinst.debhelper @@@ -1,0 -1,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 --cc debian/keepassx.postrm.debhelper index 0000000,0000000..33e6455 new file mode 100644 --- /dev/null +++ b/debian/keepassx.postrm.debhelper @@@ -1,0 -1,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 --cc debian/keepassx.substvars index 0000000,0000000..ed90318 new file mode 100644 --- /dev/null +++ b/debian/keepassx.substvars @@@ -1,0 -1,0 +1,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 --cc debian/patches/10_RemoveSystray.dpatch index 27de627,0000000..04ecd35 mode 100755,000000..100755 --- a/debian/patches/10_RemoveSystray.dpatch +++ b/debian/patches/10_RemoveSystray.dpatch @@@ -1,157 -1,0 +1,157 @@@ +#! /bin/sh /usr/share/dpatch/dpatch-run - ## RemoveSystray.dpatch by ++## 10_RemoveSystray.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ - diff -urNad keepassx-0.4.1~/src/main.cpp keepassx-0.4.1/src/main.cpp - --- keepassx-0.4.1~/src/main.cpp 2009-09-03 18:53:44.000000000 +0200 - +++ keepassx-0.4.1/src/main.cpp 2009-12-15 17:17:27.222405495 +0100 ++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.1~/src/mainwindow.cpp keepassx-0.4.1/src/mainwindow.cpp - --- keepassx-0.4.1~/src/mainwindow.cpp 2009-09-14 10:59:05.000000000 +0200 - +++ keepassx-0.4.1/src/mainwindow.cpp 2009-12-15 17:17:27.222405495 +0100 - @@ -72,7 +72,9 @@ ++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); - @@ -207,7 +209,9 @@ ++@@ -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())); - @@ -278,9 +282,11 @@ ++@@ -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(){ - @@ -327,9 +333,11 @@ ++@@ -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(&name)));\ - @@ -1082,7 +1090,9 @@ ++@@ -1102,7 +1110,9 @@ + config->setHSplitterPos(HSplitter->saveState()); + config->setShowStatusbar(statusBar()->isVisible()); + ++#ifndef Q_WS_HILDON + delete SysTray; ++#endif + QMainWindow::closeEvent(e); + QApplication::quit(); + } - @@ -1133,7 +1143,9 @@ ++@@ -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) { - @@ -1225,6 +1237,7 @@ ++@@ -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()){ - @@ -1243,6 +1256,7 @@ ++@@ -1263,6 +1276,7 @@ + } + } + } ++#endif + + void KeepassMainWindow::restoreWindow(){ - showNormal(); - @@ -1344,7 +1358,9 @@ ++ #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(); - @@ -1359,7 +1375,9 @@ ++@@ -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(); - @@ -1481,6 +1499,7 @@ ++@@ -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 { - @@ -1490,6 +1509,7 @@ ++@@ -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.1~/src/mainwindow.h keepassx-0.4.1/src/mainwindow.h - --- keepassx-0.4.1~/src/mainwindow.h 2009-12-15 16:55:18.000000000 +0100 - +++ keepassx-0.4.1/src/mainwindow.h 2009-12-15 17:17:27.232398814 +0100 - @@ -131,7 +131,9 @@ ++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 --cc debian/patches/20_LargeIcons.dpatch index 2ba0fbe,0000000..505e803 mode 100755,000000..100755 --- a/debian/patches/20_LargeIcons.dpatch +++ b/debian/patches/20_LargeIcons.dpatch @@@ -1,19 -1,0 +1,19 @@@ +#! /bin/sh /usr/share/dpatch/dpatch-run - ## 20_LargeIcons.dpatch by ++## 20_LargeIcons.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ - diff -urNad keepassx-0.4.1~/src/KpxConfig.h keepassx-0.4.1/src/KpxConfig.h - --- keepassx-0.4.1~/src/KpxConfig.h 2009-12-15 17:17:21.000000000 +0100 - +++ keepassx-0.4.1/src/KpxConfig.h 2009-12-15 17:37:33.632426586 +0100 - @@ -99,7 +99,7 @@ ++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 --cc debian/patches/30_Paths.dpatch index a7a2dda,0000000..4c9e3b9 mode 100755,000000..100755 --- a/debian/patches/30_Paths.dpatch +++ b/debian/patches/30_Paths.dpatch @@@ -1,19 -1,0 +1,19 @@@ +#! /bin/sh /usr/share/dpatch/dpatch-run - ## 30_Paths.dpatch by ++## 30_Paths.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ - diff -urNad keepassx-maemo~/src/src.pro keepassx-maemo/src/src.pro - --- keepassx-maemo~/src/src.pro 2009-12-15 18:32:05.000000000 +0100 - +++ keepassx-maemo/src/src.pro 2009-12-15 18:55:25.293330744 +0100 ++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 --cc debian/rules index 898f867,0000000..8d1bd14 mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,73 -1,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 ++ 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