Merge lp:~bregma/libertine/package-split into lp:libertine/trunk

[Stephen M. Webb]

split into separate packages for each component

Split Libertine into separate packages.

[lp:~bregma/libertine/package-split]

100. By Stephen M. Webb on 2015-08-24

convert to bzr split mode

101. By Stephen M. Webb on 2015-08-25

tweaked test command for out-of-source builds

102. By Stephen M. Webb on 2015-08-25

libertine.pc: new built file

103. By Stephen M. Webb on 2015-08-25

used correct ABI version in lib package name

104. By Stephen M. Webb on 2015-08-25

propagated CMake vars into pkgconfig file

105. By Stephen M. Webb on 2015-08-26

fixed the pkgconfig file again

106. By Stephen M. Webb on 2015-08-26

liblibertine/libertine.pc.in: added an extra ll to -llibertine

107. By Stephen M. Webb on 2015-08-26

liblibertine/libertine.pc.in: more variable tweaking

[Christopher Townsend (townsend)]

Ok, works.

review: Approve

[lp:~bregma/libertine/package-split]

108. By Stephen M. Webb on 2015-08-28

initial release (lp: #1489773)

109. By Stephen M. Webb on 2015-08-28

debian/control: made python3-libertine Architecture: all

110. By Stephen M. Webb on 2015-09-02

added symbols file

111. By Stephen M. Webb on 2015-09-02

debian/control: fixed package descriptions

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2015-09-02 18:59:00 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-01 02:00:37 +0000
+++ debian/changelog	2015-09-02 18:59:00 +0000
@@ -1,5 +1,5 @@
 libertine (0.99-0ubuntu1) UNRELEASED; urgency=medium
 
-  * Initial release.
+  * initial release (lp: #1489773)
 
  -- Stephen M. Webb <[e-mail]>  Sun, 31 May 2015 18:36:35 -0400

=== modified file 'debian/control'
--- debian/control	2015-08-20 15:15:49 +0000
+++ debian/control	2015-09-02 18:59:00 +0000
@@ -4,12 +4,13 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 9),
+               gobject-introspection,
                libgirepository1.0-dev,
                libglib2.0-dev,
                libgtest-dev,
                libpam0g-dev,
-               gobject-introspection,
                python3-dev,
+               python3-gi,
                python3-testtools,
                qtdeclarative5-dev
 Standards-Version: 3.9.6
@@ -17,17 +18,69 @@
 
 Package: libertine
 Architecture: any
-Depends: qml-module-qtquick2,
+Depends: libertine-tools,
+         qml-module-qtquick2,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
-         python3-lxc,
-         lxc-templates,
-         uidmap,
-         proot,
-         ${gir:Depends},
          ${misc:Depends},
-         ${python3:Depends},
          ${shlibs:Depends}
 Description: sandbox for running deb-packaged X11 apps on Ubuntu Personal
  Provides a container and releated tools to be able to create, maintain, and
  integrate legacy deb-packaged applications generally based around the X11
  display manager on a Ubuntu "Snappy Personal" system.
+
+Package: libertine-tools
+Architecture: any
+Depends: python3-libertine,
+         ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends}
+Description: CLI tools for running deb-packaged X11 apps on Ubuntu Personal
+ Command-line tools that can be used for creating, manipulating, and using
+ the Ubuntu Personal sandbox for legacy Deb-packaged X11 applicatons.
+
+Package: liblibertine1
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: runtime for running deb-packaged X11 apps on Ubuntu Personal
+ Runtime library for creating and using the Ubuntu Personal sandbox for legacy
+ Deb-packaged X11 applicatons.  This library is used by the Libertine tools
+ and other software interacting wit hthe Libertine container, such as scopes
+ or application launchers.
+
+Package: liblibertine-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: liblibertine1 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: developer files for the Libertine application sandbox
+ Headers and shared libraries used to create the tools for creating and using
+ the Ubuntu Personal sandbox for legacy Deb-packaged X11 applicatons.
+
+Package: gir1.2-libertine
+Architecture: any
+Multi-Arch: same
+Depends: liblibertine1 (= ${binary:Version}),
+         ${gir:Depends},
+         ${misc:Depends}
+Description: GObject introspection files for the Libertine application sandbox
+ The GObject introspection description files for the Libertine application
+ sandbox runtime.  This package allows the Libertine API to be used from
+ GIR-compliant languages such as Python.
+
+Package: python3-libertine
+Architecture: all
+Section: python
+Multi-Arch: allowed
+Depends: gir1.2-libertine,
+         lxc-templates,
+         proot,
+         python3-lxc,
+         uidmap,
+         ${misc:Depends},
+         ${python3:Depends}
+Description: Python3 scripts for the Libertine application sandbox
+ Python3 modules for the Libertine application sandbox tools.

=== added file 'debian/gir1.2-libertine.install'
--- debian/gir1.2-libertine.install	1970-01-01 00:00:00 +0000
+++ debian/gir1.2-libertine.install	2015-09-02 18:59:00 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/girepository-1.0/Libertine-1.typelib
+usr/share/gir-1.0/Libertine-1.gir

=== added file 'debian/libertine-tools.install'
--- debian/libertine-tools.install	1970-01-01 00:00:00 +0000
+++ debian/libertine-tools.install	2015-09-02 18:59:00 +0000
@@ -0,0 +1,2 @@
+usr/bin/libertine-launch
+usr/bin/libertine_container_manager

=== added file 'debian/libertine.install'
--- debian/libertine.install	1970-01-01 00:00:00 +0000
+++ debian/libertine.install	2015-09-02 18:59:00 +0000
@@ -0,0 +1,4 @@
+usr/bin/libertine
+usr/share/applications/libertine.desktop
+usr/share/libertine/libertine_64.png
+usr/share/libertine/qml/*

=== added file 'debian/liblibertine-dev.install'
--- debian/liblibertine-dev.install	1970-01-01 00:00:00 +0000
+++ debian/liblibertine-dev.install	2015-09-02 18:59:00 +0000
@@ -0,0 +1,3 @@
+usr/include/liblibertine
+usr/lib/*/liblibertine.so
+usr/lib/*/pkgconfig/libertine.pc

=== added file 'debian/liblibertine1.install'
--- debian/liblibertine1.install	1970-01-01 00:00:00 +0000
+++ debian/liblibertine1.install	2015-09-02 18:59:00 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/liblibertine.so.*

=== added file 'debian/liblibertine1.symbols'
--- debian/liblibertine1.symbols	1970-01-01 00:00:00 +0000
+++ debian/liblibertine1.symbols	2015-09-02 18:59:00 +0000
@@ -0,0 +1,6 @@
+liblibertine.so.1 liblibertine1 #MINVER#
+ (regex|optional)".+@Base" 0.99
+ libertine_container_home_path@Base 0.99
+ libertine_container_name@Base 0.99
+ libertine_container_path@Base 0.99
+ libertine_list_containers@Base 0.99

=== added file 'debian/python3-libertine.install'
--- debian/python3-libertine.install	1970-01-01 00:00:00 +0000
+++ debian/python3-libertine.install	2015-09-02 18:59:00 +0000
@@ -0,0 +1,1 @@
+usr/lib/python*/*/libertine

=== modified file 'debian/source/format'
--- debian/source/format	2015-06-01 12:25:15 +0000
+++ debian/source/format	2015-09-02 18:59:00 +0000
@@ -1,1 +1,1 @@
-3.0 (quilt)
+1.0

=== modified file 'liblibertine/CMakeLists.txt'
--- liblibertine/CMakeLists.txt	2015-08-18 20:56:13 +0000
+++ liblibertine/CMakeLists.txt	2015-09-02 18:59:00 +0000
@@ -26,9 +26,14 @@
   pam
 )
 
-install(FILES libertine.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/liblibertine-${API_VERSION}")
+set(liblibertine_headers_path "${CMAKE_INSTALL_FULL_INCLUDEDIR}/liblibertine")
+install(FILES libertine.h DESTINATION ${liblibertine_headers_path})
 install(TARGETS libertine-common LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
+configure_file(libertine.pc.in ${CMAKE_BINARY_DIR}/libertine.pc @ONLY)
+install(FILES ${CMAKE_BINARY_DIR}/libertine.pc
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
 ##########################
 # Introspection
 ##########################

=== added file 'liblibertine/libertine.pc.in'
--- liblibertine/libertine.pc.in	1970-01-01 00:00:00 +0000
+++ liblibertine/libertine.pc.in	2015-09-02 18:59:00 +0000
@@ -0,0 +1,11 @@
+prefix=@CMAKE_INSTALL_FULL_PREFIX@
+exec_prefix=${prefix}
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+
+Name: libertine
+Description: Libertine legacy application sandbox
+Version: @PROJECT_VERSION@
+
+Requires: @LIBERTINE_REQUIRES@
+Libs: -L${libdir} -llibertine
+Cflags: -I@liblibertine_headers_path@

=== modified file 'tests/unit/CMakeLists.txt'
--- tests/unit/CMakeLists.txt	2015-08-20 14:42:33 +0000
+++ tests/unit/CMakeLists.txt	2015-09-02 18:59:00 +0000
@@ -20,11 +20,12 @@
 )
 
 add_test(test_libertine_public_gir
-  "/usr/bin/python3" "-m" "testtools.run" "${CMAKE_CURRENT_SOURCE_DIR}/libertine_public_gir_tests.py"
+  "/usr/bin/python3" "-m" "testtools.run" "libertine_public_gir_tests"
 )
 set_tests_properties(test_libertine_public_gir
                      PROPERTIES
-                     ENVIRONMENT "GI_TYPELIB_PATH=${CMAKE_BINARY_DIR}/liblibertine;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/liblibertine:${LD_LIBRARY_PATH};CMAKE_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}")
+                     ENVIRONMENT
+                     "GI_TYPELIB_PATH=${CMAKE_BINARY_DIR}/liblibertine;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/liblibertine:${LD_LIBRARY_PATH};CMAKE_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR};PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}")
 set_tests_properties(test_libertine_public_gir
                      PROPERTIES
                      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")