Skip to content

Commit

Permalink
MDEV-32546: Make sure that Debian .install files are alphabetically o…
Browse files Browse the repository at this point in the history
…rdered

Fix Debian .install files to alphabetically ordered from
mostly ordered state.
  • Loading branch information
illuusio authored and grooverdan committed Feb 19, 2024
1 parent 9b6e267 commit 88d7953
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 26 deletions.
1 change: 1 addition & 0 deletions debian/libmariadb-dev.install
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ usr/include/mariadb/mysql.h
usr/include/mariadb/mysql/
usr/include/mariadb/mysql/client_plugin.h
usr/include/mariadb/mysql/plugin_auth.h
usr/include/mariadb/mysql/plugin_auth_common.h
usr/include/mariadb/mysql_com.h
usr/include/mariadb/mysql_version.h
usr/include/mariadb/mysqld_error.h
Expand Down
6 changes: 3 additions & 3 deletions debian/mariadb-client-compat.install
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
usr/bin/mysql
usr/bin/mysqlbinlog
usr/bin/mysql_convert_table_format
usr/bin/mysql_find_rows
usr/bin/mysql_fix_extensions
usr/bin/mysql_plugin
usr/bin/mysql_secure_installation
usr/bin/mysql_setpermission
usr/bin/mysql_tzinfo_to_sql
usr/bin/mysql_waitpid
usr/bin/mysqlaccess
usr/bin/mysqladmin
usr/bin/mysqlbinlog
usr/bin/mysqlcheck
usr/bin/mysqldump
usr/bin/mysqldumpslow
usr/bin/mysqlhotcopy
usr/bin/mysqlimport
usr/bin/mysql_secure_installation
usr/bin/mysqlshow
usr/bin/mysqlslap
usr/share/man/man1/mysql.1
Expand All @@ -29,10 +29,10 @@ usr/share/man/man1/mysql_waitpid.1
usr/share/man/man1/mysqlaccess.1
usr/share/man/man1/mysqladmin.1
usr/share/man/man1/mysqlbinlog.1
usr/share/man/man1/mysqlcheck.1
usr/share/man/man1/mysqldump.1
usr/share/man/man1/mysqldumpslow.1
usr/share/man/man1/mysqlhotcopy.1
usr/share/man/man1/mysqlimport.1
usr/share/man/man1/mysqlshow.1
usr/share/man/man1/mysqlslap.1
usr/share/man/man1/mysqlcheck.1
2 changes: 1 addition & 1 deletion debian/mariadb-plugin-connect-jdbc.install
Original file line number Diff line number Diff line change
@@ -1 +1 @@
usr/share/mariadb/JdbcInterface.jar
usr/share/mariadb/JdbcInterface.jar
8 changes: 4 additions & 4 deletions debian/mariadb-server-compat.install
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
usr/bin/mysql_install_db
usr/bin/mysql_upgrade
usr/bin/mysqld_multi
usr/bin/mysqld_safe
usr/bin/mysqld_safe_helper
usr/bin/mysql_install_db
usr/bin/mysql_upgrade
usr/sbin/mysqld
usr/share/man/man1/mysql_install_db.1
usr/share/man/man1/mysql_upgrade.1
usr/share/man/man1/mysqld_multi.1
usr/share/man/man1/mysqld_safe.1
usr/share/man/man1/mysqld_safe_helper.1
usr/share/man/man1/mysql_install_db.1
usr/share/man/man1/mysql_upgrade.1
usr/share/man/man8/mysqld.8
4 changes: 2 additions & 2 deletions debian/mariadb-server-core.install
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ usr/share/man/man1/mariadb-upgrade.1
usr/share/man/man1/resolveip.1
usr/share/man/man8/mariadbd.8
usr/share/mariadb/bulgarian
usr/share/mariadb/chinese
usr/share/mariadb/charsets
usr/share/mariadb/chinese
usr/share/mariadb/czech
usr/share/mariadb/danish
usr/share/mariadb/dutch
usr/share/mariadb/english
usr/share/mariadb/estonian
usr/share/mariadb/fill_help_tables.sql
usr/share/mariadb/french
usr/share/mariadb/german
usr/share/mariadb/georgian
usr/share/mariadb/german
usr/share/mariadb/greek
usr/share/mariadb/hindi
usr/share/mariadb/hungarian
Expand Down
32 changes: 16 additions & 16 deletions debian/not-installed
Original file line number Diff line number Diff line change
Expand Up @@ -7,63 +7,63 @@ etc/mysql/mariadb.conf.d/server.cnf # Debian packaging uses files from debian/ad
lib/systemd/system/mariadb-extra.socket # Installed by rules file
lib/systemd/system/mariadb-extra@.socket # Installed by rules file
lib/systemd/system/mariadb.service # Installed by rules file
lib/systemd/system/mariadb.socket # Installed by rules file
lib/systemd/system/mariadb@.service # Installed by rules file
lib/systemd/system/mariadb.socket # Installed by rules file
lib/systemd/system/mariadb@.socket # Installed by rules file
usr/bin/mariadb-embedded # Shipping the embedded server in distro packaging does not make sense
usr/bin/mysql_config # Debian packaging has mysql_config as symlink to mariadb_config
usr/bin/mysql_embedded # Symlink to mariadb-embedded which is intentionally not included
usr/bin/sst_dump # Use the one from rocksdb-tools package
usr/bin/uca-dump
usr/bin/wsrep_sst_backup
usr/lib/aarch64-linux-gnu/libdbbc.a # ColumnStore header file
usr/lib/aarch64-linux-gnu/libidbboot.a # ColumnStore header file
usr/lib/aarch64-linux-gnu/libprocessor.a # ColumnStore header file
usr/lib/aarch64-linux-gnu/libwe_xml.a # ColumnStore header file
usr/lib/sysusers.d/mariadb.conf # Not used (yet) in Debian systemd
usr/lib/tmpfiles.d/mariadb.conf # Not used (yet) in Debian systemd
usr/lib/x86_64-linux-gnu/libdbbc.a # ColumnStore header file
usr/lib/x86_64-linux-gnu/libidbboot.a # ColumnStore header file
usr/lib/x86_64-linux-gnu/libprocessor.a # ColumnStore header file
usr/lib/x86_64-linux-gnu/libwe_xml.a # ColumnStore header file
usr/bin/uca-dump
usr/bin/wsrep_sst_backup
usr/lib/sysusers.d/mariadb.conf # Not used (yet) in Debian systemd
usr/lib/tmpfiles.d/mariadb.conf # Not used (yet) in Debian systemd
usr/sbin/rcmysql
usr/share/doc/mariadb-server/COPYING (related file: "debian/tmp/usr/share/mariadb/mroonga/COPYING")
usr/share/doc/mariadb-server/CREDITS
usr/share/doc/mariadb-server/INSTALL-BINARY
usr/share/doc/mariadb-server/README-wsrep
usr/share/doc/mariadb-server/README.md
usr/share/doc/mariadb-server/README-wsrep
usr/share/doc/mariadb-server/THIRDPARTY
usr/share/groonga-normalizer-mysql/README.md
usr/share/groonga-normalizer-mysql/lgpl-2.0.txt
usr/share/groonga/COPYING
usr/share/groonga-normalizer-mysql/lgpl-2.0.txt
usr/share/groonga-normalizer-mysql/README.md
usr/share/groonga/README.md
usr/share/man/man1/mariadb-embedded.1 # Shipping the embedded server in distro packaging does not make sense
usr/share/man/man1/mysql_embedded.1 # Symlink to mariadb-embedded.1 which is intentionally not included
usr/share/man/man1/my_safe_process.1
usr/share/man/man1/mysql-stress-test.pl.1
usr/share/man/man1/mysql_embedded.1 # Symlink to mariadb-embedded.1 which is intentionally not included
usr/share/man/man1/mysql.server.1
usr/share/mariadb/Mongo2.jar
usr/share/mariadb/Mongo3.jar
usr/share/man/man1/mysql-stress-test.pl.1
usr/share/mariadb/binary-configure
usr/share/mariadb/magic
usr/share/mariadb/mariadb.logrotate
usr/share/mariadb/maria_add_gis_sp.sql # mariadb-server-core.install has *_bootstrap.sql
usr/share/mariadb/mariadb.logrotate
usr/share/mariadb/mariadb-test/asan.supp
usr/share/mariadb/mariadb-test/lsan.supp
usr/share/mariadb/mariadb-test/unstable-tests
usr/share/mariadb/mysql.server # Debian packaging uses mariadb-server.mariadb.init
usr/share/mariadb/Mongo2.jar
usr/share/mariadb/Mongo3.jar
usr/share/mariadb/mysqld_multi.server
usr/share/mariadb/mysql.server # Debian packaging uses mariadb-server.mariadb.init
usr/share/mariadb/policy/apparmor/README # In MariaDB we don't want to use AppArmor at the moment
usr/share/mariadb/policy/apparmor/usr.sbin.mysqld # In MariaDB we don't want to use AppArmor at the moment
usr/share/mariadb/policy/apparmor/usr.sbin.mysqld.local # In MariaDB we don't want to use AppArmor at the moment
usr/share/mariadb/policy/selinux/README # In MariaDB we don't want to use SELinux at the moment
usr/share/mariadb/policy/selinux/mariadb-server.fc # In MariaDB we don't want to use SELinux at the moment
usr/share/mariadb/policy/selinux/mariadb-server.te # In MariaDB we don't want to use SELinux at the moment
usr/share/mariadb/policy/selinux/mariadb.te # In MariaDB we don't want to use SELinux at the moment
usr/share/mariadb/policy/selinux/README # In MariaDB we don't want to use SELinux at the moment
usr/share/mariadb/systemd/mariadb-extra@.socket # Installed by rules file
usr/share/mariadb/systemd/mariadb.service # Installed by rules file
usr/share/mariadb/systemd/mariadb@.service # Installed by rules file
usr/share/mariadb/systemd/mariadb@.socket # Installed by rules file
usr/share/mariadb/systemd/mysql.service # Installed by rules file
usr/share/mariadb/systemd/mysqld.service # Installed by rules file
usr/share/mariadb/systemd/mysql.service # Installed by rules file
usr/share/mariadb/systemd/use_galera_new_cluster.conf

0 comments on commit 88d7953

Please sign in to comment.