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

Bug#777720: Suggested debdiff for #777720, #777723 and #777724



Hello!

I made the necessary changes to the debian/control file to fix the
dependency issues of cqrlog both when using MySQL and MariaDB
(#777720 and #777723).

Furthermore, I added xplanet to Recommends in debian/control such
that xplanet is actually available when cqrlog is installed
(#777724).

Attaching a debdiff with my suggested changes.

Cheers,
Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz@debian.org
`. `'   Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

diff -Nru cqrlog-1.8.2/debian/changelog cqrlog-1.8.2/debian/changelog
--- cqrlog-1.8.2/debian/changelog	2014-10-04 17:14:15.000000000 +0200
+++ cqrlog-1.8.2/debian/changelog	2015-02-11 23:30:37.000000000 +0100
@@ -1,3 +1,17 @@
+cqrlog (1.8.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Switch order of Recommends mariadb-server and mysql-server in debian/control
+    to fix that cqrlog cannot be installed when mysql-server is not installed
+    (Closes: #777720).
+  * Add mariadb-client as an alternative dependency for cqrlog in debian/control
+    to fix the installation when using cqrlog with MariaDB (Closes: #777723).
+  * Add xplanet to Recommends in debian/control as cqrlog contains a menu
+    shortcut for it in its main window which is otherwise useless
+    (Closes: #777724).
+
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Wed, 11 Feb 2015 23:01:45 +0100
+
 cqrlog (1.8.2-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru cqrlog-1.8.2/debian/control cqrlog-1.8.2/debian/control
--- cqrlog-1.8.2/debian/control	2014-07-27 22:01:40.000000000 +0200
+++ cqrlog-1.8.2/debian/control	2015-02-11 23:27:21.000000000 +0100
@@ -9,8 +9,8 @@
 
 Package: cqrlog
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libssl-dev, mysql-client, libhamlib2 (>= 1.2.10), libhamlib-utils (>= 1.2.10)
-Recommends: mariadb-server | mysql-server
+Depends: ${shlibs:Depends}, ${misc:Depends}, libssl-dev, mysql-client | mariadb-client, libhamlib2 (>= 1.2.10), libhamlib-utils (>= 1.2.10)
+Recommends: mysql-server | mariadb-server, xplanet
 Description: Advanced logging program for hamradio operators
  CQRLOG is an advanced ham radio logger based on MySQL embedded database. 
  Provides radio control based on hamlib libraries (currently support of 140+ 

Reply to: