Don't package private library and typelib files separately.

The cinnamon-screensaver package is already arch-specific, and
libcscreensaver isn't used outside of this package.

- Remove the libcscreensaver0 package.
- Move helpers and libcscreensaver to a /usr/libexec private folder.
- Clean up some variables, various build details.

Author: mtwebster

backup-locker/meson.build

@@ -16,7 +16,8 @@ backup_locker = executable('cs-backup-locker',
   include_directories: inc,
   dependencies: [x11, gtk, glib],
   link_with: libcscreensaver,
-  install_dir: libexecdir,
+  install_rpath: pkglibdir,
+  install_dir: pkglibdir,
   install: true
 )
 

data/meson.build

@@ -8,8 +8,6 @@ endif
 dbus_service = configure_file(
   output: 'org.cinnamon.ScreenSaver.service',
   input: 'org.cinnamon.ScreenSaver.service.in',
-  # meson 0.49
-  # configuration: { 'EXPANDED_BINDIR': bindir }
   configuration: misc_conf
 )
 

data/org.cinnamon.ScreenSaver.service.in

@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.cinnamon.ScreenSaver
-Exec=@EXPANDED_BINDIR@/cinnamon-screensaver
+Exec=@bindir@/cinnamon-screensaver

debian/cinnamon-screensaver.install

@@ -1,10 +1,9 @@
 etc/pam.d/cinnamon-screensaver
 usr/bin
-usr/lib/*/cinnamon-screensaver/cinnamon-screensaver-pam-helper
-usr/lib/*/cinnamon-screensaver/cs-backup-locker
 usr/share/applications
 usr/share/cinnamon-screensaver/*.css
 usr/share/cinnamon-screensaver/*.py
 usr/share/cinnamon-screensaver/*/*.py
 usr/share/dbus-1
 usr/share/icons
+usr/libexec/cinnamon-screensaver

debian/control

@@ -30,7 +30,6 @@ Depends:
  gir1.2-gtk-3.0,
  gir1.2-xapp-1.0,
  iso-flag-png,
- libcscreensaver0 (= ${binary:Version}),
  libxdo3,
  python3,
  python3-gi,
@@ -46,7 +45,8 @@ Recommends: libpam-gnome-keyring
 Breaks: 
  cinnamon-screensaver-pam-helper (<< 3.8),
  cinnamon-screensaver-webkit-plugin (<< 3.9),
- cinnamon-screensaver-x-plugin (<< 3.9)
+ cinnamon-screensaver-x-plugin (<< 3.9),
+ libcscreensaver0 (<< ${source:Version})
 Replaces:
  cinnamon-screensaver-pam-helper (<< 3.8),
  cinnamon-screensaver-webkit-plugin (<< 3.9),
@@ -61,18 +61,6 @@ Priority: extra
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libcscreensaver0 (= ${binary:Version}), ${misc:Depends}
+Depends: cinnamon-screensaver (= ${binary:Version}), ${misc:Depends}
 Description: Cinnamon Screensaver library - debug symbols
  This package contains the symbols files needed to debug the Cinnamon Screensaver library.
-
-Package: libcscreensaver0
-Section: libs
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: library and introspection data used by cinnamon-screensaver
- cinnamon-screensaver is a screen saver and locker that aims to have simple,
- sane and secure defaults, and be well integrated with the Cinnamon desktop.
- .
- This package contains the library used by the screensaver.

debian/libcscreensaver0.install

@@ -11,7 +11,7 @@ override_dh_strip:
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-	--libexecdir=lib/$(DEB_HOST_MULTIARCH)/cinnamon-screensaver \
+	--libexecdir=libexec \
 	--buildtype=debugoptimized \
 	-D use-debian-pam=true \
 

debian/rules

@@ -140,24 +140,13 @@ endif
 libcscreensaver = library(
   'cscreensaver',
   cscreensaver_sources + gir_sources,
-  version: '0.0.0',
   include_directories: inc,
   cpp_args: '-DG_LOG_DOMAIN="CScreensaver"',
   dependencies: libcscreensaver_deps,
+  install_dir: pkglibdir,
   install: true
 )
 
-pkgconfig.generate(
-  # TODO meson 0.46 replace libraries, name, version with positional library argument
-  libraries: libcscreensaver,
-  name: 'cscreensaver',
-  version: meson.project_version(),
-  description: 'Small utility lib used by cinnamon-screensaver v3.1+ to provide a GdkWindow filter (not currently introspectable)',
-  subdirs: 'cscreensaver',
-  # these should be their variables, but meson < 0.46 strikes again
-  requires: ['gobject-2.0', 'gtk+-3.0', 'gdk-3.0']
-)
-
 cscreensaver_gir = gnome.generate_gir(
   libcscreensaver,
   sources: gir_sources,
@@ -166,8 +155,8 @@ cscreensaver_gir = gnome.generate_gir(
   identifier_prefix: 'Cs',
   symbol_prefix: 'cs_',
   includes: 'Gtk-3.0',
+  install_dir_typelib: typelibdir,
   install: true
-
 )
 
 test_passwd = executable(

libcscreensaver/meson.build

@@ -14,6 +14,9 @@ bindir = join_paths(prefix, get_option('bindir'))
 datadir = join_paths(prefix, get_option('datadir'))
 pkgdatadir = join_paths(datadir, meson.project_name())
 libexecdir = join_paths(prefix, get_option('libexecdir'))
+pkglibdir = join_paths(libexecdir, meson.project_name())
+typelibdir = join_paths(pkglibdir, 'girepository-1.0')
+
 libdir = join_paths(prefix, get_option('libdir'))
 #needed?
 sysconfdir = join_paths(prefix, get_option('sysconfdir'))
@@ -24,10 +27,10 @@ localedir = join_paths(prefix, get_option('localedir'))
 # and 0.49 for using them in configure_file
 misc_conf = configuration_data()
 misc_conf.set('prefix', prefix)
-misc_conf.set('EXPANDED_BINDIR', bindir)
+misc_conf.set('bindir', bindir)
 misc_conf.set('datadir', datadir)
 misc_conf.set('pkgdatadir', pkgdatadir)
-misc_conf.set('libexecdir', libexecdir)
+misc_conf.set('pkglibdir', pkglibdir)
 misc_conf.set('libdir', libdir)
 misc_conf.set('PACKAGE', meson.project_name())
 misc_conf.set('VERSION', meson.project_version())

meson.build

@@ -5,4 +5,7 @@ if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
   exit 1
 fi
 
+export GI_TYPELIB_PATH="@typelibdir@"
+export LD_LIBRARY_PATH="@pkglibdir@"
+
 exec @install_dir@/@target@ "$@"