This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2godesktopsharing. from a149b26 debian/control: Add B-D: libqt5svg5-dev. new 02761d6 Drop build cruft (moc_listdialog.cpp). new e31b9e6 debian/rules: Add dh_clean override, so that the build dir gets tidied up properly after build (this really needs to go into the qmake .pro file, but debian/rules is easier...). The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 5 ++++ debian/rules | 10 ++++++++ moc_listdialog.cpp | 71 ------------------------------------------------------ 3 files changed, 15 insertions(+), 71 deletions(-) delete mode 100644 moc_listdialog.cpp -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 02761d6c7e2910f2611ad9f1f910016560ee4fb8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Nov 11 15:35:38 2018 +0000 Drop build cruft (moc_listdialog.cpp). --- debian/changelog | 1 + moc_listdialog.cpp | 71 ------------------------------------------------------ 2 files changed, 1 insertion(+), 71 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6916937..7996461 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium - x2godesktopsharing.pro: Define TARGET as x2godesktopsharing. - simplelocalsocket.cpp: Stop using deprecated QString::toAscii() function (replace it by toLatin1()). + - Drop build cruft (moc_listdialog.cpp). * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/moc_listdialog.cpp b/moc_listdialog.cpp deleted file mode 100644 index d0eec92..0000000 --- a/moc_listdialog.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'listdialog.h' -** -** Created: Tue May 25 09:27:14 2010 -** by: The Qt Meta Object Compiler version 59 (Qt 4.4.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "listdialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'listdialog.h' doesn't include <QObject>." -#elif Q_MOC_OUTPUT_REVISION != 59 -#error "This file was generated using the moc from 4.4.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ListDialog[] = { - - // content: - 1, // revision - 0, // classname - 0, 0, // classinfo - 1, 10, // methods - 0, 0, // properties - 0, 0, // enums/sets - - // slots: signature, parameters, type, tag, flags - 12, 11, 11, 11, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_ListDialog[] = { - "ListDialog\0\0slotDel()\0" -}; - -const QMetaObject ListDialog::staticMetaObject = { - { &QMessageBox::staticMetaObject, qt_meta_stringdata_ListDialog, - qt_meta_data_ListDialog, 0 } -}; - -const QMetaObject *ListDialog::metaObject() const -{ - return &staticMetaObject; -} - -void *ListDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ListDialog)) - return static_cast<void*>(const_cast< ListDialog*>(this)); - return QMessageBox::qt_metacast(_clname); -} - -int ListDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QMessageBox::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - switch (_id) { - case 0: slotDel(); break; - } - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit e31b9e67181c3e40e6025873e5d8c0b1ec76fd42 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Nov 11 15:38:01 2018 +0000 debian/rules: Add dh_clean override, so that the build dir gets tidied up properly after build (this really needs to go into the qmake .pro file, but debian/rules is easier...). --- debian/changelog | 4 ++++ debian/rules | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7996461..b61b68c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,10 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium + Convert to DH packaging style. Build against Qt5. * debian/control: + Bump Standards-Version: to 4.2.1. No changes needed. + * debian/rules: + + Add dh_clean override, so that the build dir gets tidied up + properly after build (this really needs to go into the qmake + .pro file, but debian/rules is easier...). * debian/x2godesktopsharing.menu: + Drop file. The menu file is not allowed if a .desktop file is present. diff --git a/debian/rules b/debian/rules index 2ce4f2c..e0d7762 100755 --- a/debian/rules +++ b/debian/rules @@ -31,3 +31,13 @@ override_dh_install: install -m 644 icons/64x64/x2godesktopsharing.png $(CURDIR)/debian/x2godesktopsharing/usr/share/icons/hicolor/64x64/apps/x2godesktopsharing.png install -m 644 icons/32x32/x2godesktopsharing.png $(CURDIR)/debian/x2godesktopsharing/usr/share/icons/hicolor/32x32/apps/x2godesktopsharing.png dh_install + +override_dh_clean: + -dh_clean + rm -f *.o x2godesktopsharing_*.qm + rm -f moc_*.cpp moc_*.h + rm -f .qmake.stash + rm -f qmake_qmake_immediate.qrc + rm -f qrc_qmake_qmake_immediate.cpp + rm -f ui_dlg.h + rm -f x2godesktopsharing -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
-
git-admin＠x2go.org