Merge lp:~mterry/libunity-misc/modernize-build into lp:libunity-misc

[Michael Terry]

Modernize build system by porting to dh9 and cleaning up packaging

Modernize build system by porting to dh9. Plus some other cleanups around the place. Including adding gtk+-3.0 to the pc file.

[lp:~mterry/libunity-misc/modernize-build]

39. By Michael Terry on 2012-12-12

fix copyright fields

40. By Michael Terry on 2012-12-12

add multiarch Pre-Depends and use gensymbols level 4

[Didier Roche (didrocks)]

Hum, this looks mostly good but:
- you didn't bump the version, so bzr bd try to use the old tarball and can't rerun everything. Maybe you should bump to 4.0.5
- thre is no split mode and .bzr-buildddeb/ dir (forgotten bzr add? ;))

review: Needs Fixing

[lp:~mterry/libunity-misc/modernize-build]

41. By Michael Terry on 2012-12-12

bump version and add bzr-builddeb split mode config

[Michael Terry (mterry)]

Good catches! Added the bzr-builddeb and bumped the version. Please re-review!

[Didier Roche (didrocks)]

Looking very good to me :) Approving.
Thanks Michael! One less on the list.

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-12-12 17:54:19 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-29 15:04:00 +0000
+++ debian/changelog	2012-12-12 17:54:19 +0000
@@ -1,3 +1,12 @@
+libunity-misc (4.0.5-0ubuntu1) UNRELEASED; urgency=low
+
+  * Convert to dh9
+  * Bump standards to 3.9.4
+  * Update copyright to dep5 format
+  * Automatic snapshot from revision 34 (bootstrap)
+
+ -- Michael Terry <[e-mail]>  Mon, 10 Dec 2012 17:09:27 -0500
+
 libunity-misc (4.0.4-0ubuntu2) oneiric; urgency=low
 
   * Cherry-pick from upstream:

=== modified file 'debian/compat'
--- debian/compat	2010-01-25 16:04:10 +0000
+++ debian/compat	2012-12-12 17:54:19 +0000
@@ -1,1 +1,1 @@
-5
+9

=== modified file 'debian/control'
--- debian/control	2012-12-10 22:43:53 +0000
+++ debian/control	2012-12-12 17:54:19 +0000
@@ -1,26 +1,27 @@
 Source: libunity-misc
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 5.0),
-               cdbs (>= 0.4.41),
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                gnome-common,
                gtk-doc-tools,
+               libglib2.0-dev (>= 2.22.0),
                libgtk-3-dev (>= 3.0),
-               libglib2.0-dev (>= 2.22.0),
                libx11-dev,
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Section: libs
 Homepage: https://launchpad.net/libunity-misc
 # If you aren't a member of ~unity-team but need to upload packaging changes,
 # just go ahead.  ~unity-team will notice and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~unity-team/libunity/trunk
+Vcs-Bzr: https://code.launchpad.net/~unity-team/libunity-misc/trunk
 
 Package: libunity-misc-dev
 Section: libdevel
 Architecture: any
-Depends: libunity-misc4 (= ${binary:Version}), ${misc:Depends},
+Depends: ${misc:Depends},
+         libunity-misc4 (= ${binary:Version}),
          libglib2.0-dev (>= 2.22.0),
+         libgtk-3-dev (>= 3.0),
 Description: Miscellaneous functions for Unity - development files
  libunity-misc is a shared library that provides miscellaneous functions for
  Unity.
@@ -30,7 +31,9 @@
 Package: libunity-misc4
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
 Description: Miscellaneous functions for Unity - shared library
  libunity-misc is a shared library that provides miscellaneous functions for
  Unity.
@@ -40,8 +43,8 @@
 Package: libunity-misc-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
-Suggests: devhelp
+Depends: ${misc:Depends},
+Suggests: devhelp,
 Description: Miscellaneous functions for Unity - documentation
  libunity-misc is a shared library that provides miscellaneous functions for
  Unity.

=== modified file 'debian/copyright'
--- debian/copyright	2010-06-03 17:19:27 +0000
+++ debian/copyright	2012-12-12 17:54:19 +0000
@@ -1,75 +1,100 @@
-This work was packaged for Ubuntu by:
-
-    Didier Roche <[e-mail]> on Fri, 15 Jan 2010 17:05:36 +0100
-
-It was downloaded from https://launchpad.net/libunity-misc
-
-Upstream Author(s):
-
-    Neil Jagdish Patel <[e-mail]>
-    Anders Carlsson <[e-mail]>
-    Vincent Untz
-    Neil Jagdish Patel <[e-mail]>
-
-Copyright:
-
-    Copyright (C) 2002 Anders Carlsson
-    Copyright (C) 2003-2006 Vincent Untz
-    Copyright (C) 2008 Red Hat, Inc.
-    Copyright (C) 2009 Gnome Shell
-    Copyright (C) 2010 Canonical, Ltd.
-
-License:
-
-    When not otherwise specified, the following license applies:
-
-      This library is free software; you can redistribute it and/or
-      modify it under the terms of the GNU Lesser General Public
-      License Version as published by the Free Software Foundation; either
-      version 2 of the License, or (at your option) any later version.
-
-      This library is distributed in the hope that it will be useful,
-      but WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Lesser General Public License for more details.
-
-On Debian systems, the complete text of the GNU Lesser General Public License
-can be found in `/usr/share/common-licenses/LGPL-2'
-
-    * unity-misc/unity-misc.h:
-
-      This library is free software; you can redistribute it and/or modify
-      it under the terms of the GNU Lesser General Public License
-      version 3.0 as published by the Free Software Foundation.
-
-      This library is distributed in the hope that it will be useful,
-      but WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-      GNU Lesser General Public License version 3.0 for more details.
-
-On Debian systems, the complete text of the GNU Lesser General Public License
-can be found in `/usr/share/common-licenses/LGPL-3'
-
-    * unity-misc/unity-tray-manager.h,shell-embedded-window-private.h,
-      unity-tray-manager.c,shell-embedded-window.c,shell-gtk-embed.h,
-      shell-gtk-embed.c,shell-embedded-window.h:
-
-      This program is free software: you can redistribute it and/or modify it
-      under the terms of the the GNU General Public License version 2, as
-      published by the Free Software Foundation.
- 
-      This program is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranties of
-      MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
-      PURPOSE.  See the applicable version of the GNU Lesser General Public
-      License for more details.
- 
-On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL-2'
-
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Canonical Ltd.
-
-and is licensed under the GPL version 3, see `/usr/share/common-licenses/GPL-3'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: libunity-misc
+Source: http://launchpad.net/libunity-misc
+
+Files: *
+Copyright: 2010-2012 Canonical, Ltd.
+License: LGPL-2+
+
+Files: unity-misc/fixedtip.c
+Copyright: 2001 Havoc Pennington
+           2003-2006 Vincent Untz
+License: GPL-2+
+
+Files: unity-misc/fixedtip.h
+Copyright: 2001 Havoc Pennington
+           2002 Red Hat Inc.
+           2003-2006 Vincent Untz
+License: GPL-2+
+
+Files: unity-misc/gnome-bg-slideshow.c
+Copyright: 2000 Eazel, Inc.
+           2007-2008 Red Hat, Inc.
+           2011 Canonical Ltd.
+License: LGPL-2+
+
+Files: unity-misc/gnome-bg-slideshow.h
+Copyright: 2007 Red Hat, Inc.
+License: LGPL-2+
+
+Files: unity-misc/na-tray-manager.[ch]
+       unity-misc/na-tray.h
+Copyright: 2002 Anders Carlsson <[e-mail]>
+           2003-2006 Vincent Untz
+License: LGPL-2+
+
+Files: unity-misc/na-tray-child.[ch]
+Copyright: 2002 Anders Carlsson <[e-mail]>
+           2003-2006 Vincent Untz
+           2008 Red Hat, Inc.
+License: LGPL-2+
+
+Files: unity-misc/na-tray.c
+Copyright: 2002 Red Hat, Inc.
+           2003-2006 Vincent Untz
+           2007 Christian Persch
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2010-2012 Canonical Ltd
+License: GPL-3
+
+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in `/usr/share/common-licenses/GPL-2'
+
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 3 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in `/usr/share/common-licenses/GPL-3'
+
+License: LGPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ can be found in `/usr/share/common-licenses/LGPL-2'

=== modified file 'debian/libunity-misc-dev.install'
--- debian/libunity-misc-dev.install	2010-01-25 16:04:10 +0000
+++ debian/libunity-misc-dev.install	2012-12-12 17:54:19 +0000
@@ -1,3 +1,3 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/lib/pkgconfig/*
+usr/include/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*

=== modified file 'debian/libunity-misc-doc.install'
--- debian/libunity-misc-doc.install	2010-01-28 20:59:38 +0000
+++ debian/libunity-misc-doc.install	2012-12-12 17:54:19 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/share/gtk-doc/
+usr/share/gtk-doc/

=== modified file 'debian/libunity-misc4.install'
--- debian/libunity-misc4.install	2011-06-21 17:06:08 +0000
+++ debian/libunity-misc4.install	2012-12-12 17:54:19 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

=== modified file 'debian/rules'
--- debian/rules	2012-12-10 22:43:53 +0000
+++ debian/rules	2012-12-12 17:54:19 +0000
@@ -1,17 +1,18 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-
-LDFLAGS += -Wl,-O1 -Wl,--as-needed
-DEB_DH_AUTORECONF_ARGS = env NOCONFIGURE=1 ./autogen.sh
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-gtk-doc
-
-common-binary-post-install-arch::
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed
+export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
+
+%:
+	dh $@ --with autoreconf
+
+override_dh_autoreconf:
+	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-gtk-doc
+
+override_dh_install:
 	find debian/tmp/usr/lib -name \*.la -exec rm {} \;
 	find debian/tmp/usr/lib -name \*.a -exec rm {} \;
-
-common-binary-predeb-arch:: list-missing
+	dh_install --fail-missing

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-12-12 17:54:19 +0000
@@ -0,0 +1,1 @@
+1.0

=== modified file 'unity-misc.pc.in'
--- unity-misc.pc.in	2011-02-17 18:54:06 +0000
+++ unity-misc.pc.in	2012-12-12 17:54:19 +0000
@@ -8,4 +8,4 @@
 Version: @VERSION@
 Libs: -L${libdir} -lunity-misc
 Cflags: -I${includedir}/unity-misc
-Requires: glib-2.0 gthread-2.0 gobject-2.0 gio-2.0 gio-unix-2.0
+Requires: glib-2.0 gthread-2.0 gobject-2.0 gio-2.0 gio-unix-2.0 gtk+-3.0