Skip to content

Commit

Permalink
Deb: Update control file Depends to include only variables that are set
Browse files Browse the repository at this point in the history
Don't include variables that are empty and unused.
  • Loading branch information
ottok committed Apr 4, 2020
1 parent 2cedf3e commit 333e1d8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
17 changes: 8 additions & 9 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ Architecture: any
Section: libs
Depends: libmariadb3,
mariadb-common,
${misc:Depends},
${shlibs:Depends}
${misc:Depends}
Breaks: libmysqlclient19,
libmysqlclient20,
libmysqlclient21
Expand Down Expand Up @@ -196,8 +195,7 @@ Provides: libmysqld-dev
Pre-Depends: ${misc:Pre-Depends}
Depends: libmariadb-dev (= ${binary:Version}),
libmariadbd19 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
${misc:Depends}
Breaks: libmysqld-dev
Replaces: libmysqld-dev
Description: MariaDB embedded database, development files
Expand All @@ -210,8 +208,7 @@ Description: MariaDB embedded database, development files

Package: mysql-common
Architecture: all
Depends: ${misc:Depends},
${shlibs:Depends}
Depends: ${misc:Depends}
Description: MariaDB database common files (e.g. /etc/mysql/my.cnf)
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query
Expand All @@ -224,8 +221,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/my.cnf)
Package: mariadb-common
Architecture: all
Depends: mysql-common,
${misc:Depends},
${shlibs:Depends}
${misc:Depends}
Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query
Expand Down Expand Up @@ -478,6 +474,7 @@ Depends: galera-4 (>=26.4),
rsync,
socat,
${misc:Depends},
${perl:Depends},
${shlibs:Depends}
Conflicts: mariadb-server (<< ${source:Version}),
mariadb-server-10.0,
Expand Down Expand Up @@ -782,6 +779,7 @@ Depends: mariadb-client-10.5 (= ${binary:Version}),
mariadb-server-10.5 (= ${binary:Version}),
mariadb-test-data (= ${source:Version}),
${misc:Depends},
${perl:Depends},
${shlibs:Depends}
Breaks: mariadb-server-5.5,
mariadb-test-10.0,
Expand Down Expand Up @@ -822,7 +820,8 @@ Description: MariaDB database regression test suite
Package: mariadb-test-data
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Breaks: mariadb-test-10.0,
mariadb-test-10.1,
mariadb-test-10.2,
Expand Down
2 changes: 1 addition & 1 deletion debian/libmariadb-dev-compat.install
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
usr/bin/mysql_config
usr/lib/*/libmysqlclient.a
usr/lib/*/libmysqlclient.so
usr/lib/*/libmysqlclient_r.a
usr/lib/*/libmysqlclient_r.so
usr/bin/mysql_config

0 comments on commit 333e1d8

Please sign in to comment.