[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#925283: unblock: x2godesktopsharing/3.2.0.0-2

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package x2godesktopsharing

+  [ Helmut Grohne ]
+  * Fix FTCBFS: (Closes: #917894)
+    + Add missing Build-Depends: qt5-qmake:native for lrelease.
+    + Run the right qmake through dh_auto_configure. Run it once only.

Yet, another FTCBFS bug fixed... Thanks to Helmut's great efforts.

+  [ Mike Gabriel ]
+  * debian/control:
+    + Bump Standards-Version: to 4.3.0. No changes needed.

Formalistic change.

+  * debian/copyright:
+    + Update auto-generated copyright.in file.

Also formalistic change.

unblock x2godesktopsharing/3.2.0.0-2

-- System Information:
Debian Release: buster/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.19.0-2-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

diff -Nru x2godesktopsharing-3.2.0.0/debian/changelog x2godesktopsharing-3.2.0.0/debian/changelog
--- x2godesktopsharing-3.2.0.0/debian/changelog	2018-11-28 12:09:27.000000000 +0100
+++ x2godesktopsharing-3.2.0.0/debian/changelog	2019-03-22 14:02:04.000000000 +0100
@@ -1,3 +1,18 @@
+x2godesktopsharing (3.2.0.0-2) unstable; urgency=medium
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: (Closes: #917894)
+    + Add missing Build-Depends: qt5-qmake:native for lrelease.
+    + Run the right qmake through dh_auto_configure. Run it once only.
+
+  [ Mike Gabriel ]
+  * debian/control:
+    + Bump Standards-Version: to 4.3.0. No changes needed.
+  * debian/copyright:
+    + Update auto-generated copyright.in file.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Fri, 22 Mar 2019 14:02:04 +0100
+
 x2godesktopsharing (3.2.0.0-1) unstable; urgency=medium
 
   * Initial release to Debian. (Closes: #913489).
diff -Nru x2godesktopsharing-3.2.0.0/debian/control x2godesktopsharing-3.2.0.0/debian/control
--- x2godesktopsharing-3.2.0.0/debian/control	2018-11-28 12:09:27.000000000 +0100
+++ x2godesktopsharing-3.2.0.0/debian/control	2019-03-22 14:01:32.000000000 +0100
@@ -6,10 +6,11 @@
  Mike Gabriel <sunweaver@debian.org>,
 Build-Depends:
  debhelper-compat (= 11),
+ qt5-qmake:native,
  qtbase5-dev,
  qttools5-dev-tools,
  libqt5svg5-dev,
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Homepage: https://wiki.x2go.org
 Vcs-Git: https://salsa.debian.org/debian-remote-team/x2godesktopsharing.git
 Vcs-Browser: https://salsa.debian.org/debian-remote-team/x2godesktopsharing/
diff -Nru x2godesktopsharing-3.2.0.0/debian/copyright.in x2godesktopsharing-3.2.0.0/debian/copyright.in
--- x2godesktopsharing-3.2.0.0/debian/copyright.in	2018-11-11 16:44:15.000000000 +0100
+++ x2godesktopsharing-3.2.0.0/debian/copyright.in	2019-01-12 21:57:49.000000000 +0100
@@ -4,8 +4,7 @@
 Source: FIXME
 Disclaimer: Autogenerated by CDBS
 
-Files: ChangeLog
- Doxyfile
+Files: Doxyfile
  VERSION.x2godesktopsharing
  debian/changelog
  debian/control
@@ -20,6 +19,7 @@
  debian/x2godesktopsharing.manpages
  dlg.ui
  icons/svg/black-list.svg
+ icons/svg/dialog-question.svg
  icons/svg/display-allowed.svg
  icons/svg/display-protected.svg
  icons/svg/eye.svg
@@ -31,15 +31,10 @@
  icons/svg/x2godesktopsharing.svg
  icons/x2godesktopsharing.xpm
  man/man1/x2godesktopsharing.1
- man/man8/x2goresume-desktopsharing.8
- man/man8/x2gosuspend-desktopsharing.8
- man/man8/x2goterminate-desktopsharing.8
- resources.rcc
+ resources.qrc
  rpm/x2godesktopsharing-rpmlintrc
- x2godesktopsharing-3.0.1.kdev4
  x2godesktopsharing.desktop
- x2godesktopsharing.kdevelop
- x2godesktopsharing.kdevses
+ x2godesktopsharing_cs.ts
  x2godesktopsharing_da.ts
  x2godesktopsharing_de.ts
  x2godesktopsharing_es.ts
@@ -51,45 +46,43 @@
  x2godesktopsharing_ru.ts
  x2godesktopsharing_sv.ts
  x2godesktopsharing_tr.ts
+ x2godesktopsharing_zh_tw.ts
 Copyright: NONE
 License: UNKNOWN
  FIXME
 
 Files: accessaction.cpp
  accessaction.h
+ accessdialog.cpp
+ accessdialog.h
  listdialog.cpp
- messagebox.cpp
- messagebox.h
- sharetray.cpp
- sharetray.h
  simplelocalsocket.cpp
  simplelocalsocket.h
-Copyright: 2009-2015, Copyright: See COPYING file that comes with this distribution
+Copyright: 2006-2018, Copyright: See COPYING file that comes with this distribution
+  2018, Copyright: See COPYING file that comes with this distribution
 License: UNKNOWN
  FIXME
 
-Files: bin/x2goresume-desktopsharing
- bin/x2gosuspend-desktopsharing
- bin/x2goterminate-desktopsharing
- share/x2gofeature.d/x2godesktopsharing.features
-Copyright: 2007-2015, X2Go Project - http:wiki.x2go.org
-License: GPL (v2 or later)
+Files: sharetray.cpp
+ sharetray.h
+Copyright: 2006-2018, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, (C) 2011-2018
+  See COPYING file that comes with this distribution
+License: UNKNOWN
  FIXME
 
-Files: debian/x2godesktopsharing.postinst
- moc_listdialog.cpp
- x2godesktopsharing.pro
+Files: x2godesktopsharing.pro
 Copyright: NONE
 License: GENERATED FILE
  FIXME
 
-Files: debian/copyright
-Copyright: 2007-2015, obviously nice - http:www.obviouslynice.de
+Files: share/x2gofeature.d/x2godesktopsharing.features
+Copyright: 2007-2018, X2Go Project - https:wiki.x2go.org
+  2011-2018, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: GPL (v2 or later)
  FIXME
 
 Files: main.cpp
-Copyright: 2009-2015, Oleksandr Shneyder
+Copyright: 2006-2018, Oleksandr Shneyder
 License: GPL (v2 or later) (with incorrect FSF address)
  FIXME
 
@@ -103,8 +96,20 @@
 License: UNKNOWN
  FIXME
 
+Files: debian/copyright
+Copyright: -format/1.0/
+License: UNKNOWN
+ FIXME
+
 Files: x2godesktopsharing_fr.ts
-Copyright: marrez</translation>
+Copyright: cision pour l&apos;utilisateur &quot;%1&quot;.</translation>
+  sité avec &quot;Autoriser&quot; et &quot;Accorder&quot;, mais si l&apos;on accorde une permission et on autorise un personne Ã
+  sité avec &quot;dénier l&apos;accès&quot;. Est-ce un anglicisme ?</translatorcomment>
+License: UNKNOWN
+ FIXME
+
+Files: ChangeLog
+Copyright: updates.
 License: UNKNOWN
  FIXME
 
diff -Nru x2godesktopsharing-3.2.0.0/debian/rules x2godesktopsharing-3.2.0.0/debian/rules
--- x2godesktopsharing-3.2.0.0/debian/rules	2018-11-28 11:53:32.000000000 +0100
+++ x2godesktopsharing-3.2.0.0/debian/rules	2019-03-22 14:00:06.000000000 +0100
@@ -20,10 +20,7 @@
 
 override_dh_auto_configure:
 	lrelease x2godesktopsharing.pro
-	dh_auto_configure
-
-override_dh_auto_build:
-	qmake QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" x2godesktopsharing.pro
+	dh_auto_configure -- QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" x2godesktopsharing.pro
 
 override_dh_install:
 	install -m 644 x2godesktopsharing $(CURDIR)/debian/x2godesktopsharing/usr/bin/
Reply to: