aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2014-12-14 19:51:38 -0500
committerLibravatarUnit 193 <unit193@ubuntu.com>2014-12-14 19:51:38 -0500
commit8c6e95b0c12d623f05bd2e32add8bf7ea46e16ba (patch)
tree9d13e842ce2421f3cf52f2d6ad8eecde5cbeb785
parent087c6e199363d686dc1402e260ce82030404efc5 (diff)
downloadsqlitestudio-8c6e95b0c12d623f05bd2e32add8bf7ea46e16ba.tar.bz2
sqlitestudio-8c6e95b0c12d623f05bd2e32add8bf7ea46e16ba.tar.xz
sqlitestudio-8c6e95b0c12d623f05bd2e32add8bf7ea46e16ba.tar.zst
d/control, d/rules, d/*.install: Install plugins and libraries into multiarch locations.
-rw-r--r--debian/changelog2
-rw-r--r--debian/control4
-rw-r--r--debian/libsqlitestudio1.install1
-rwxr-xr-xdebian/rules5
-rw-r--r--debian/sqlitestudio.install3
5 files changed, 11 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index a90bd4f..ec4a482 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ sqlitestudio (3.0.0-0vanir1) unstable; urgency=medium
* d/rules: Install upstream's changelog.
* d/control: Re-order packages, putting libsqlitestudio first.
* d/sqlitestudio.desktop: Fix case, SqliteStudio => SQLiteStudio.
+ * d/control, d/rules, d/*.install:
+ - Install plugins and libraries into multiarch locations.
-- Unit 193 <unit193@ubuntu.com> Sun, 14 Dec 2014 14:56:56 -0500
diff --git a/debian/control b/debian/control
index cd7b080..d0bd03b 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,8 @@ Homepage: http://sqlitestudio.pl/
Package: libsqlitestudio1
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: SQLite database manager - libraries
SQLiteStudio is a comprehensive and reliable SQLite database manager
@@ -38,6 +40,8 @@ Description: SQLite database manager
Package: sqlitestudio-plugins
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: SQLite database manager - plugins
SQLiteStudio is a comprehensive and reliable SQLite database manager
diff --git a/debian/libsqlitestudio1.install b/debian/libsqlitestudio1.install
new file mode 100644
index 0000000..2964de6
--- /dev/null
+++ b/debian/libsqlitestudio1.install
@@ -0,0 +1 @@
+usr/lib/
diff --git a/debian/rules b/debian/rules
index a1172aa..3924bc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,12 @@
#!/usr/bin/make -f
DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/default.mk
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export QT_SELECT = 5
OPTIONS += "DEFINES += NO_AUTO_UPDATES"
+OPTIONS += "LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/"
%:
dh $@ --parallel --builddirectory=builddir
@@ -26,7 +27,7 @@ override_dh_auto_build:
cp SQLiteStudio3/guiSQLiteStudio/img/sqlitestudio.svg output/hicolor/scalable/apps
override_dh_auto_install:
- dh_auto_install --builddirectory=builddir -- INSTALL_ROOT=$(CURDIR)/debian/libsqlitestudio1
+ dh_auto_install --builddirectory=builddir -- INSTALL_ROOT=$(CURDIR)/debian/tmp/
dh_auto_install --builddirectory=plugins_builddir -- INSTALL_ROOT=$(CURDIR)/debian/sqlitestudio-plugins
override_dh_installchangelogs:
diff --git a/debian/sqlitestudio.install b/debian/sqlitestudio.install
index 548641a..b6e8166 100644
--- a/debian/sqlitestudio.install
+++ b/debian/sqlitestudio.install
@@ -1,4 +1,3 @@
-output/SQLiteStudio/sqlitestudio usr/bin/
-output/SQLiteStudio/sqlitestudiocli usr/bin/
+usr/bin/
output/hicolor/ usr/share/icons
debian/sqlitestudio.desktop usr/share/applications