Merge lp:~3v1n0/bamf/soname-up into lp:bamf/0.4

[Marco Trevisan (Treviño)]

libbamf: bump the SONAME value and remove the unneeded libwnck dependencies

BUMP the SONAME version and remove some unneeded libwnck dependencies of the library.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:512
http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/22/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/./build=pbuilder,distribution=quantal,flavor=amd64/22/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/./build=pbuilder,distribution=quantal,flavor=i386/22/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/22//rebuild/?

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

Are you bumping from 0 to 4? The SONAME is currently 0 I thought. Also, you'll need to update the packaging a bit. Change the package name from libbamf3-0 to libbamf3-1 etc.

[lp:~3v1n0/bamf/soname-up]

513. By Marco Trevisan (Treviño) on 2012-12-19

libbamf: use 1.0.0 as SONAME

514. By Marco Trevisan (Treviño) on 2012-12-19

debian: remove the unneded dependencies, rename libbamf3-0.* files

515. By Marco Trevisan (Treviño) on 2012-12-19

debian/control: put back the trailing comma

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:513
http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/23/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/./build=pbuilder,distribution=quantal,flavor=amd64/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/./build=pbuilder,distribution=quantal,flavor=i386/23/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/23//rebuild/?

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:515
http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/./build=pbuilder,distribution=quantal,flavor=amd64/24/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/./build=pbuilder,distribution=quantal,flavor=i386/24/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/24//rebuild/?

review: Approve (continuous-integration)

[Michael Terry (mterry)]

One last thing, sorry!

I see that you edited lib/libbamf/libbamf.pc.in, but that can actually be removed entirely. Instead edit libbamf3.pc.in.

Looks good after that.

[lp:~3v1n0/bamf/soname-up]

516. By Marco Trevisan (Treviño) on 2012-12-19

libbamf: remove the libbamf.pc.in file

517. By Marco Trevisan (Treviño) on 2012-12-19

Updating .bzrignore

[Marco Trevisan (Treviño) (3v1n0)]

> One last thing, sorry!
>
> I see that you edited lib/libbamf/libbamf.pc.in, but that can actually be
> removed entirely. Instead edit libbamf3.pc.in.
>
> Looks good after that.

Right. Done.

[Michael Terry (mterry)]

Awesome, thanks!

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-12-18 01:53:22 +0000
+++ .bzrignore	2012-12-19 18:29:24 +0000
@@ -7,6 +7,7 @@
 compile
 config.guess
 config.h
+config.h.in
 config.log
 config.status
 config.sub
@@ -24,11 +25,6 @@
 examples/Makefile.in
 examples/alt-tabber
 examples/desktop-file-launcher
-lib/libwncksync/Makefile
-lib/libwncksync/Makefile.in
-lib/libwncksync/libwncksync.la
-lib/libwncksync/libwncksync.pc
-lib/libwncksync/libwncksync_la-libwncksync.lo
 module/Makefile
 module/Makefile.in
 module/libgiodbus.la
@@ -36,14 +32,8 @@
 module/libgiodbus_la-gapplaunchhandlerdbus.lo
 src/Makefile
 src/Makefile.in
-src/wncksyncdaemon
-lib/libbamf/libbamf.la
-lib/libbamf/libbamf.pc
-lib/libbamf/libbamf_la-bamf-application.lo
-lib/libbamf/libbamf_la-bamf-matcher.lo
-lib/libbamf/libbamf_la-bamf-proxy.lo
-lib/libbamf/libbamf_la-bamf-view.lo
-src/bamfdbus-glue.h
+src/*-generated.c
+src/*-generated.h
 *.lo
 gtk-doc.make
 bamf-0.2.34.tar.gz
@@ -77,6 +67,9 @@
 lib/libbamf/bamf-marshal.h
 lib/libbamf/bamf-tab-source-glue.h
 lib/libbamf/stamp-marshal
+lib/libbamf/libbamf3.la
+lib/libbamf/libbamf3.pc
+lib/libbamf/libbamf3.vapi
 m4/gtk-doc.m4
 module/libgiobamf.la
 src/bamf-marshal.h

=== modified file 'configure.ac'
--- configure.ac	2012-12-13 21:54:59 +0000
+++ configure.ac	2012-12-19 18:29:24 +0000
@@ -151,14 +151,13 @@
 AC_SUBST(BAMFDAEMON_LIBS)
 
 origgiomodulesdir=`pkg-config --variable=giomoduledir gio-2.0`
-# Make giomodulesdir honour 'prefix', so that distcheck works. 
+# Make giomodulesdir honour 'prefix', so that distcheck works.
 giomodulesdir=`echo "$origgiomodulesdir" | sed 's|/usr|${prefix}|'`
 AC_SUBST(giomodulesdir)
 
 AC_OUTPUT([
 Makefile
 lib/libbamf/Makefile
-lib/libbamf/libbamf.pc
 lib/libbamf/libbamf3.pc
 src/Makefile
 tests/functional/Makefile

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-18 01:53:22 +0000
+++ debian/changelog	2012-12-19 18:29:24 +0000
@@ -6,6 +6,9 @@
   [ Marco Trevisan (Treviño) ]
   * Remove the unneeded libbamf0.symbols and libbamf0.install
   * Update libbamf3.symbols removing the indicator functions
+  * Remove the unneeded library dependencies on libwnck
+  * Bump the SONAME
+  * Update the package version to libbamf3-1
 
  -- Didier Roche <[e-mail]>  Wed, 05 Dec 2012 17:34:41 +0100
 

=== modified file 'debian/control'
--- debian/control	2012-12-05 16:35:24 +0000
+++ debian/control	2012-12-19 18:29:24 +0000
@@ -39,7 +39,7 @@
  module that facilitates the matching of applications started
  through GDesktopAppInfo
 
-Package: libbamf3-0
+Package: libbamf3-1
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -55,11 +55,9 @@
 Package: libbamf3-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libbamf3-0 (= ${binary:Version}),
-         libwnck-3-dev,
-         libglib2.0-dev (>= 2.23.0-1ubuntu3~),
+Depends: ${misc:Depends},
+         libbamf3-1 (= ${binary:Version}),
+         libglib2.0-dev (>= 2.30.0),
 Suggests: libbamf-doc
 Description: Window matching library - development files
  bamf matches application windows to desktop files
@@ -86,7 +84,7 @@
 Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libbamf3-0 (= ${binary:Version}),
+         libbamf3-1 (= ${binary:Version}),
 Description: Window matching library - debugging symbols
  bamf matches application windows to desktop files
  .

=== renamed file 'debian/libbamf3-0.install' => 'debian/libbamf3-1.install'
=== renamed file 'debian/libbamf3-0.symbols' => 'debian/libbamf3-1.symbols'
--- debian/libbamf3-0.symbols	2012-12-18 01:53:22 +0000
+++ debian/libbamf3-1.symbols	2012-12-19 18:29:24 +0000
@@ -1,4 +1,4 @@
-libbamf3.so.0 libbamf3-0 #MINVER#
+libbamf3.so.1 libbamf3-1 #MINVER#
  bamf_application_get_application_menu@Base 0.3.0
  bamf_application_get_application_type@Base 0.2.20
  bamf_application_get_desktop_file@Base 0.2.20

=== modified file 'lib/libbamf/Makefile.am'
--- lib/libbamf/Makefile.am	2012-12-18 01:53:22 +0000
+++ lib/libbamf/Makefile.am	2012-12-19 18:29:24 +0000
@@ -71,6 +71,7 @@
 libbamf3_la_LDFLAGS = \
   -shared \
   -export-symbols-regex "^bamf_" \
+  -version-info 1:0:0 \
   $(COVERAGE_LDFLAGS) \
   $(NULL)
 

=== removed file 'lib/libbamf/libbamf.pc.in'
--- lib/libbamf/libbamf.pc.in	2010-09-14 13:07:10 +0000
+++ lib/libbamf/libbamf.pc.in	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libbamf
-Description: C Convenience library for bamf d-bus server.
-Version: @VERSION@
-
-Requires: glib-2.0 libwnck-1.0
-Libs: -L${libdir} -lbamf
-Cflags: -I${includedir}/libbamf -I${libdir}/libbamf/include -DWNCK_I_KNOW_THIS_IS_UNSTABLE
-

=== modified file 'lib/libbamf/libbamf3.pc.in'
--- lib/libbamf/libbamf3.pc.in	2011-05-31 14:28:05 +0000
+++ lib/libbamf/libbamf3.pc.in	2012-12-19 18:29:24 +0000
@@ -7,7 +7,7 @@
 Description: C Convenience library for bamf d-bus server.
 Version: @VERSION@
 
-Requires: glib-2.0 libwnck-3.0
+Requires: glib-2.0
 Libs: -L${libdir} -lbamf3
-Cflags: -I${includedir}/libbamf3 -I${libdir}/libbamf3/include -DWNCK_I_KNOW_THIS_IS_UNSTABLE
+Cflags: -I${includedir}/libbamf3 -I${libdir}/libbamf3/include
 

=== modified file 'tests/libbamf/Makefile.am'
--- tests/libbamf/Makefile.am	2012-11-19 18:43:50 +0000
+++ tests/libbamf/Makefile.am	2012-12-19 18:29:24 +0000
@@ -11,11 +11,9 @@
   -I$(top_srcdir)/src \
   -I$(top_srcdir)/lib/libbamf \
   -I$(top_builddir)/lib/libbamf \
-  -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
   -DTESTDIR=\""$(abs_top_srcdir)/tests/libbamf"\" \
   $(GCC_FLAGS) \
   $(GTK_CFLAGS) \
-  $(WNCK_CFLAGS) \
   $(LIBWSBIND_CFLAGS) \
   $(DBUS_CFLAGS) \
   $(GLIB_CFLAGS)
@@ -23,7 +21,6 @@
 test_libbamf_LDADD = \
   $(top_builddir)/lib/libbamf/libbamf$(LIBBAMF_VER).la \
   $(LIBWSBIND_LIBS) \
-  $(WNCK_LIBS) \
   $(GLIB_LIBS) \
   $(GTK_LIBS) \
   $(DBUS_LIBS)