Merge lp:~didrocks/nux/build-nux4.0 into lp:nux

[Didier Roche]

Bump the major version number up to 4.

Bump the major version number up to 4.
Add needed packaging changes to Tim's change.

[Daniel van Vugt (vanvugt)]

It's about time. Works for me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/30/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=armel/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=armhf/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/30/console

review: Needs Fixing (continuous-integration)

[Didier Roche (didrocks)]

You need to start thinking about changing and synchronizing with the packaging Tim :)
I'll propose a branch today with that change superseeding that MR.

[Daniel van Vugt (vanvugt)]

Umm, seems correct.

review: Approve

=== 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	2012-11-12 07:33:21 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'configure.ac'
--- configure.ac	2012-11-05 21:31:06 +0000
+++ configure.ac	2012-11-12 07:33:21 +0000
@@ -13,11 +13,11 @@
 #   - Increase micro_version to the next odd number
 #   - Increase interface_version to the next odd number
 # 
-m4_define([nux_major_version], [3])
-m4_define([nux_minor_version], [4])
+m4_define([nux_major_version], [4])
+m4_define([nux_minor_version], [0])
 m4_define([nux_micro_version], [0])
 
-m4_define([nux_api_version], [3.0])
+m4_define([nux_api_version], [4.0])
 # Increase the number (to the current date) everytime you propose a branch that breaks the API or ABI
 # The number format is : year/month/day
 # e.g.: december 5th, 2011 is: 20111205
@@ -55,7 +55,7 @@
 AC_INIT([nux],
         [nux_version],
         [https://bugs.launchpad.net/nux])
-AC_COPYRIGHT([Copyright 2010 Inalogic Inc.])
+AC_COPYRIGHT([Copyright 2010-2012 Inalogic Inc.])
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-05 21:31:06 +0000
+++ debian/changelog	2012-11-12 07:33:21 +0000
@@ -1,12 +1,17 @@
-nux (3.10.0-0ubuntu2) UNRELEASED; urgency=low
+nux (4.0.0-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Michael Terry ]
   * debian/control:
     - Update Vcs-Bzr
     - Build-Depend on dh-autoreconf and gnome-common
   * debian/rules:
     - Use dh_autoreconf
 
- -- Michael Terry <[e-mail]>  Mon, 05 Nov 2012 16:30:30 -0500
+  [ Didier Roche ]
+  * Transition packaging to Nux 4.0
+  * Add split mode for daily build
+
+ -- Didier Roche <[e-mail]>  Mon, 12 Nov 2012 08:12:53 +0100
 
 nux (3.10.0-0ubuntu1) quantal-proposed; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-11-05 21:31:06 +0000
+++ debian/control	2012-11-12 07:33:21 +0000
@@ -39,10 +39,10 @@
 # just go ahead.  ~unity-team will notice and sync up the code again.
 Vcs-Bzr: https://code.launchpad.net/~unity-team/nux/trunk
 
-Package: libnux-3.0-0
+Package: libnux-4.0-0
 Section: libs
 Architecture: any
-Depends: libnux-3.0-common (= ${source:Version}),
+Depends: libnux-4.0-common (= ${source:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
 Provides: libnux-abiversion-${nuxabiversion}
@@ -63,10 +63,10 @@
  .
  This package contains various tools for nux
 
-Package: libnux-3.0-dev
+Package: libnux-4.0-dev
 Section: libdevel
 Architecture: any
-Depends: libnux-3.0-0 (= ${binary:Version}),
+Depends: libnux-4.0-0 (= ${binary:Version}),
          libglib2.0-dev (>= 2.25.14),
          libgdk-pixbuf2.0-dev,
          libcairo2-dev (>= 1.9.14),
@@ -88,7 +88,7 @@
  .
  This package contains files that are needed to build applications.
 
-Package: libnux-3.0-common
+Package: libnux-4.0-common
 Section: libs
 Architecture: all
 Depends: ${misc:Depends}

=== renamed file 'debian/libnux-3.0-0.install' => 'debian/libnux-4.0-0.install'
=== renamed file 'debian/libnux-3.0-common.install' => 'debian/libnux-4.0-common.install'
--- debian/libnux-3.0-common.install	2012-07-03 10:08:23 +0000
+++ debian/libnux-4.0-common.install	2012-11-12 07:33:21 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/share/nux/3.0
+debian/tmp/usr/share/nux/4.0

=== renamed file 'debian/libnux-3.0-dev.install' => 'debian/libnux-4.0-dev.install'
--- debian/libnux-3.0-dev.install	2012-07-03 10:08:23 +0000
+++ debian/libnux-4.0-dev.install	2012-11-12 07:33:21 +0000
@@ -1,3 +1,3 @@
-debian/tmp/usr/include/Nux-3.0
+debian/tmp/usr/include/Nux-4.0
 debian/tmp/usr/lib/pkgconfig
 debian/tmp/usr/lib/lib*.so