From 36a58cb0c405c1e274081ceb8ade0485d481ecb4 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 29 Sep 2017 15:43:58 +0200 Subject: debian/*: Adopt official Debian packaging. --- debian/changelog | 136 ++++++++++ debian/compat | 2 +- debian/control | 278 ++++++++++----------- debian/copyright | 97 +++++-- debian/libdbusmenu-glib-dev.install | 2 +- debian/libdbusmenu-gtk-dev.install | 2 +- debian/libdbusmenu-gtk-doc.install | 2 +- debian/libdbusmenu-gtk3-dev.install | 2 +- debian/libdbusmenu-jsonloader-dev.install | 2 +- debian/libdbusmenu-tools.install | 2 +- .../0001_no-deprecated-gnome-common-macros.patch | 12 + debian/patches/README | 3 + debian/patches/series | 1 + debian/rules | 34 ++- debian/source/format | 2 +- debian/watch | 2 +- 16 files changed, 401 insertions(+), 178 deletions(-) create mode 100644 debian/patches/0001_no-deprecated-gnome-common-macros.patch create mode 100644 debian/patches/README create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index ea9009e..b20b1c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,67 @@ +libdbusmenu (16.04.1+17.04.20170109.1-4) unstable; urgency=medium + + * Upload to unstable. + + * debian/control: + + Raise versioned B-D for debhelper (>= 10.3~). + + Bump Standards-Version: to 4.0.1. No changes needed. + * debian/rules: + + Switch over from dh_install --fail-missing to dh_missing + --fail-missing. + + -- Mike Gabriel Wed, 23 Aug 2017 20:06:43 +0200 + +libdbusmenu (16.04.1+17.04.20170109.1-3) experimental; urgency=medium + + * debian/control: + + Drop Evgeni Golov from Uploaders: field per request via #debian-devel + on 2017-05-22 12:37 CEST. + * debian/rules: + + Add get-orig-source rule. + * debian/watch: + + Use Ubuntu's orig.tar.gz as orig tarball source. + + -- Mike Gabriel Tue, 23 May 2017 10:41:41 +0200 + +libdbusmenu (16.04.1+17.04.20170109.1-2) experimental; urgency=medium + + * debian/control: + + Exclude valgrind as B-D from various Debian-supported build platforms. + + -- Mike Gabriel Sat, 20 May 2017 12:15:21 +0200 + +libdbusmenu (16.04.1+17.04.20170109.1-1) experimental; urgency=medium + + * Merge new upstream release from Ubuntu. + - libdbusmenu-gtk4: Don't send Ubuntu-specific signal 'child-added' anymore. + (Closes: #850769). + * debian/patches: + + Add 0001_no-deprecated-gnome-common-macros.patch. Fully drop deprecated + gnome-common variables and macros. This and latest upstream changes... + (Closes: #829962). + * debian/control: + + New uploader for this package (Mike Gabriel). Package remains + team-maintained. (Closes: #818020). + + Replace Ubuntu's Vcs-*: fields. Now pointing to Debian's pkg-ayatana + namespace on git.debian.org. + + Bump Standards-Version: to 3.9.8. No changes needed. + + Typo fix for the word "development". + + Fix duplicate SYNOPSIS and LONG_DESCRIPTION phrases. + + Drop superfluous Pre-Depends: fields. + * debian/{control,compat}: + + Bump to DH level 10. + * debian/{control,rules}: + + Enable bindnow hardening (i.e. all hardening flags). + * debian/rules: + + Remove builddir/ on dh_auto_clean. Make build idempotent. + + Don't do parallel make during dh_auto_install. Several race conditions + have been observed for unknown reason. Avoid those. + + More dh_shlibdeps calls (for libdbusmenu-glib4, libdbusmenu-jsonloader4 + and libdbusmenu-tools). + * debian/*: Process with 'wrap-and-sort -s -b -t'. + + -- Mike Gabriel Fri, 19 May 2017 16:33:42 +0200 + libdbusmenu (16.04.1+17.04.20170109.1-0ubuntu1) zesty; urgency=medium [ Dmitry Shachnev ] @@ -248,6 +312,39 @@ libdbusmenu (12.10.3daily13.02.01-0ubuntu1) raring; urgency=low -- Automatic PS uploader Fri, 01 Feb 2013 02:01:01 +0000 +libdbusmenu (12.10.2-2) unstable; urgency=medium + + * QA upload. + * Set maintainer to Debian QA Group. (see #818020) + * Fix a spelling error in the description synopsis. + + -- Adrian Bunk Sun, 15 Jan 2017 01:28:48 +0200 + +libdbusmenu (12.10.2-1) unstable; urgency=medium + + [ Andrew Starr-Bochicchio ] + * Team upload. + * Many thanks to Andreas Cadhalpun! + + [Andreas Cadhalpun] + * Import upstream version 12.10.2. + * debian/source/format: Switch from 1.0 to 3.0 (quilt). + * debian/patches: + - Drop optional-valgrind.patch, included upstream. + - Add g_type_init.patch to fix FTBFS (g_type_init is deprecated + after glib 2.36). + - Add reference-xinclude.patch to fix FTBFS due to XInclude errors. + * debian/control: + - Update valac build-dependency. (Closes: 707409, 709690) + - Drop build-dependency on quilt. + - Drop Breaks: libdbusmenu-glib0 (shouldn't be around anymore and + lintian complains) + - Update Standards version from 3.9.3 to 3.9.5 (no changes required). + * debian/copyright: Update dates. + * debian/rules: Drop quilt code. + + -- Andrew Starr-Bochicchio Thu, 28 Aug 2014 11:15:52 -0700 + libdbusmenu (12.10.2-0ubuntu1) quantal; urgency=low * New upstream release. @@ -273,6 +370,17 @@ libdbusmenu (12.10.1-0ubuntu1) quantal; urgency=low -- Didier Roche Thu, 20 Sep 2012 19:22:52 +0200 +libdbusmenu (0.6.2-1) unstable; urgency=low + + * Import latest upstream version from Ubuntu. + * Generate header files not arch-specific by droping the full + (build time) path to the included files from comments. + Closes: #674200 + * Only disable valgrind tests, not all of them. + This reintroduces the jsonloader packages that were previously droped. + + -- Evgeni Golov Tue, 26 Jun 2012 21:13:01 +0200 + libdbusmenu (0.6.2-0ubuntu1) quantal; urgency=low * New upstream release. @@ -283,6 +391,20 @@ libdbusmenu (0.6.2-0ubuntu1) quantal; urgency=low -- Ted Gould Wed, 13 Jun 2012 14:44:52 -0500 +libdbusmenu (0.6.1-2) unstable; urgency=low + + * Disable tests, they need valgrind, not available on all arches. + + -- Evgeni Golov Mon, 21 May 2012 07:54:01 +0200 + +libdbusmenu (0.6.1-1) unstable; urgency=low + + * Import latest upstream version from Ubuntu. + Closes: #666943 + * Drop patches, applied upstream. + + -- Evgeni Golov Sun, 20 May 2012 16:48:48 +0200 + libdbusmenu (0.6.1-0ubuntu3) precise-proposed; urgency=low * Backport fix for keybindings not showing in menus bug (lp: #982656) @@ -459,6 +581,20 @@ libdbusmenu (0.5.1-0ubuntu1) precise; urgency=low -- Ted Gould Fri, 28 Oct 2011 09:35:13 -0400 +libdbusmenu (0.5.0-3) unstable; urgency=low + + * Fix GTK3 deprecations (based on upstream r352). + Closes: #669436 + * Standards-Version: 3.9.3 + + -- Evgeni Golov Sun, 22 Apr 2012 19:15:37 +0200 + +libdbusmenu (0.5.0-2) unstable; urgency=low + + * Upload to unstable. + + -- Evgeni Golov Sun, 19 Feb 2012 10:55:28 +0100 + libdbusmenu (0.5.0-1ubuntu1) precise; urgency=low * Multiarch conversion (partial, gobject instrospection not touched) diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 59fd769..93c1c2f 100644 --- a/debian/control +++ b/debian/control @@ -1,162 +1,144 @@ Source: libdbusmenu Section: gnome Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: The Ayatana Packagers -Uploaders: Evgeni Golov -Build-Depends: debhelper (>= 9), - quilt, - dh-autoreconf, - libtool, - intltool, - gnome-common, - gtk-doc-tools, - valgrind [!arm64 !ppc64el], - dbus-test-runner, - xvfb, - libglib2.0-dev (>= 2.35.4), - libgtk2.0-dev (>= 2.24.4-1~), - libgtk-3-dev (>= 2.99.2-1ubuntu2), - libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4), - libdbus-glib-1-dev, - libatk1.0-dev, - libjson-glib-dev (>= 0.13.4), - gobject-introspection (>= 1.41.4-1~), - libgirepository1.0-dev (>= 0.9.3), - libx11-dev (>= 1.3), - valac (>= 0.16), -Standards-Version: 3.9.2 +Maintainer: The Ayatana Packages +Uploaders: + Mike Gabriel , +Build-Depends: dbus-test-runner, + debhelper (>= 10.3~), + dh-autoreconf, + dpkg-dev (>= 1.16.1.1), + gnome-common, + gobject-introspection (>= 1.41.4-1~), + gtk-doc-tools, + intltool, + libatk1.0-dev, + libdbus-glib-1-dev, + libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4), + libgirepository1.0-dev (>= 0.9.3), + libglib2.0-dev (>= 2.35.4), + libgtk-3-dev (>= 2.99.2-1ubuntu2), + libgtk2.0-dev (>= 2.24.4-1~), + libjson-glib-dev (>= 0.13.4), + libtool, + libx11-dev (>= 1.3), + quilt, + valac (>= 0.16), + valgrind [!arm64 !ppc64el !armel !alpha !hppa !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpcspe !sh4 !sparc64 !x32], + xauth, + xvfb, +Standards-Version: 4.0.1 Homepage: https://launchpad.net/dbusmenu -# If you aren't a member of ~dbusmenu-team but need to upload -# packaging changes, just go ahead. ~dbusmenu-team will notice -# and sync up the code again. -Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk.13.04 -Vcs-Browser: https://bazaar.launchpad.net/~dbusmenu-team/dbusmenu/trunk.13.04/files +Vcs-Git: https://anonscm.debian.org/git/pkg-ayatana/libdbusmenu.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-ayatana/libdbusmenu.git -Package: libdbusmenu-glib4 -Section: libs +Package: gir1.2-dbusmenu-glib-0.4 +Section: introspection Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, -Pre-Depends: ${misc:Pre-Depends}, Multi-Arch: same -Description: library for passing menus over DBus +Depends: libdbusmenu-glib4 (= ${binary:Version}), + ${gir:Depends}, + ${misc:Depends}, +Description: typelib file for libdbusmenu-glib4 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . - This package contains shared libraries to be used by applications. + This package can be used by other packages using the GIRepository format to + generate dynamic bindings for libdbusmenu-glib4. -Package: libdbusmenu-glib-dev -Section: libdevel +Package: gir1.2-dbusmenu-gtk-0.4 +Section: introspection Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - gir1.2-dbusmenu-glib-0.4 (= ${binary:Version}), - libdbusmenu-glib4 (= ${binary:Version}), - libdbus-glib-1-dev (>= 0.76), - libgtk2.0-dev (>= 2.12.0), Multi-Arch: same -Description: library for passing menus over DBus - development files +Depends: libdbusmenu-gtk4 (= ${binary:Version}), + ${gir:Depends}, + ${misc:Depends}, +Description: typelib file for libdbusmenu-gtk4 (GTK-2 variant) libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . - This package contains files that are needed to build applications. + This package can be used by other packages using the GIRepository format to + generate dynamic bindings for libdbusmenu-gtk4. -Package: libdbusmenu-gtk4 -Section: libs +Package: gir1.2-dbusmenu-gtk3-0.4 +Section: introspection Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, -Pre-Depends: ${misc:Pre-Depends}, Multi-Arch: same -Description: library for passing menus over DBus - GTK+ version +Depends: libdbusmenu-gtk3-4 (= ${binary:Version}), + ${gir:Depends}, + ${misc:Depends}, +Description: typelib file for libdbusmenu-gtk3-4 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . - This package contains shared libraries to be used by GTK+ applications. + This package can be used by other packages using the GIRepository format to + generate dynamic bindings for libdbusmenu-gtk3-4. -Package: libdbusmenu-gtk-dev +Package: libdbusmenu-glib-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - gir1.2-dbusmenu-gtk-0.4 (= ${binary:Version}), - libdbusmenu-gtk4 (= ${binary:Version}), - libdbus-glib-1-dev (>= 0.76), - libgtk2.0-dev (>= 2.12.0), - libdbusmenu-glib-dev, +Depends: gir1.2-dbusmenu-glib-0.4 (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76), + libdbusmenu-glib4 (= ${binary:Version}), + libgtk2.0-dev (>= 2.12.0), + ${misc:Depends}, + ${shlibs:Depends}, Multi-Arch: same -Description: library for passing menus over DBus - GTK+ version developement files +Description: library for passing menus over DBus - development files libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . - This package contains files that are needed to build GTK+ applications. + This package contains files that are needed to build applications. -Package: libdbusmenu-tools -Section: devel -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - python, - libdbusmenu-glib4 (= ${binary:Version}), -Multi-Arch: foreign -Description: tools useful during development with libdbusmenu +Package: libdbusmenu-glib-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Description: library for passing menus over DBus - documentation libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . - This package contains tools that are useful when developing and building - applications with libdbusmenu. + This package contains developer documentation for libdbusmenu-glib. -Package: gir1.2-dbusmenu-glib-0.4 -Section: introspection +Package: libdbusmenu-glib4 +Section: libs Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} Multi-Arch: same -Depends: ${misc:Depends}, - libdbusmenu-glib4 (= ${binary:Version}), - ${gir:Depends}, -Description: typelib file for libdbusmenu-glib4 +Description: library for passing menus over DBus libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . - This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-glib4. + This package contains shared libraries to be used by applications. -Package: gir1.2-dbusmenu-gtk-0.4 -Section: introspection +Package: libdbusmenu-gtk-dev +Section: libdevel Architecture: any +Depends: gir1.2-dbusmenu-gtk-0.4 (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76), + libdbusmenu-glib-dev, + libdbusmenu-gtk4 (= ${binary:Version}), + libgtk2.0-dev (>= 2.12.0), + ${misc:Depends}, + ${shlibs:Depends}, Multi-Arch: same -Depends: ${misc:Depends}, - libdbusmenu-gtk4 (= ${binary:Version}), - ${gir:Depends}, -Description: typelib file for libdbusmenu-gtk4 +Description: library for passing menus over DBus - GTK-2+ version development files libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . - This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-gtk4. - -Package: libdbusmenu-glib-doc -Section: doc -Architecture: all -Depends: ${misc:Depends}, -Description: library for passing menus over DBus - documentation - libdbusmenu passes a menu structure across DBus so that a program can - create a menu simply without worrying about how it is displayed on the - other side of the bus. - . - This package contains developer documentation for libdbusmenu-glib. + This package contains files that are needed to build GTK-2+ applications. Package: libdbusmenu-gtk-doc Section: doc Architecture: all -Depends: ${misc:Depends}, +Depends: ${misc:Depends} Description: library for passing menus over DBus - GTK+ version documentation libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -164,83 +146,91 @@ Description: library for passing menus over DBus - GTK+ version documentation . This package contains developer documentation for libdbusmenu-gtk. -Package: libdbusmenu-jsonloader4 +Package: libdbusmenu-gtk3-4 Section: libs Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, -Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends} Multi-Arch: same -Description: library for passing menus over DBus - Test lib +Description: library for passing menus over DBus - GTK-3+ version libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . - This package contains shared libraries to be used by test suites in - applications or libraries using dbusmenu. + This package contains shared libraries to be used by GTK-3+ applications. -Package: libdbusmenu-jsonloader-dev +Package: libdbusmenu-gtk3-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libdbusmenu-jsonloader4 (= ${binary:Version}), - libdbus-glib-1-dev (>= 0.76), - libdbusmenu-glib-dev (= ${binary:Version}), - libjson-glib-dev, +Depends: gir1.2-dbusmenu-gtk3-0.4 (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76), + libdbusmenu-glib-dev, + libdbusmenu-gtk3-4 (= ${binary:Version}), + libgtk-3-dev (>= 2.91.4-0ubuntu1), + ${misc:Depends}, + ${shlibs:Depends}, Multi-Arch: same -Description: library for passing menus over DBus - Test lib development files +Description: library for passing menus over DBus - GTK-3+ version development files libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . - This package contains files that are needed to build test suites in - applications or libraries using dbusmenu. + This package contains files that are needed to build GTK-3+ applications. -Package: libdbusmenu-gtk3-4 +Package: libdbusmenu-gtk4 Section: libs Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, -Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends} Multi-Arch: same -Description: library for passing menus over DBus - GTK+ version +Description: library for passing menus over DBus - GTK-2+ version libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . - This package contains shared libraries to be used by GTK+ applications. + This package contains shared libraries to be used by GTK-2+ applications. -Package: libdbusmenu-gtk3-dev +Package: libdbusmenu-jsonloader-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - gir1.2-dbusmenu-gtk3-0.4 (= ${binary:Version}), - libdbusmenu-gtk3-4 (= ${binary:Version}), - libdbus-glib-1-dev (>= 0.76), - libgtk-3-dev (>= 2.91.4-0ubuntu1), - libdbusmenu-glib-dev, +Depends: libdbus-glib-1-dev (>= 0.76), + libdbusmenu-glib-dev (= ${binary:Version}), + libdbusmenu-jsonloader4 (= ${binary:Version}), + libjson-glib-dev, + ${misc:Depends}, + ${shlibs:Depends}, Multi-Arch: same -Description: library for passing menus over DBus - GTK+ version developement files +Description: library for passing menus over DBus - Test lib development files libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . - This package contains files that are needed to build GTK+ applications. + This package contains files that are needed to build test suites in + applications or libraries using dbusmenu. -Package: gir1.2-dbusmenu-gtk3-0.4 -Section: introspection +Package: libdbusmenu-jsonloader4 +Section: libs Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} Multi-Arch: same -Depends: ${misc:Depends}, - libdbusmenu-gtk3-4 (= ${binary:Version}), - ${gir:Depends}, -Description: typelib file for libdbusmenu-gtk3-4 +Description: library for passing menus over DBus - Test lib libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . - This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-gtk4. + This package contains shared libraries to be used by test suites in + applications or libraries using dbusmenu. +Package: libdbusmenu-tools +Section: devel +Architecture: any +Depends: libdbusmenu-glib4 (= ${binary:Version}), + python, + ${misc:Depends}, + ${shlibs:Depends}, +Multi-Arch: foreign +Description: tools useful during development with libdbusmenu + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains tools that are useful when developing and building + applications with libdbusmenu. diff --git a/debian/copyright b/debian/copyright index 6d7c11b..e554b5c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,40 +1,91 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 -Name: libdbusmenu -Maintainer: Ted Gould +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libdbusmenu +Upstream-Contact: Ted Gould Source: https://launchpad.net/dbusmenu Files: * -Copyright: 2009-2010 Ted Gould , Canonical Ltd. +Copyright: + 2009-2010, Ted Gould , Canonical Ltd. License: GPL-3 -Files: libdbusmenu-{glib,gtk}/* -Copyright: 2009-2010 Ted Gould , Canonical Ltd. -License: LGPL-2.1 | LGPL-3 +Files: libdbusmenu-glib/* + libdbusmenu-gtk/* +Copyright: + 2009-2010, Ted Gould , Canonical Ltd. +License: LGPL-2.1 or LGPL-3 Files: libdbusmenu-glib/dbus-menu.xml -Copyright: 2009-2010 Ted Gould , Canonical Ltd. -Copyright: 2009-2010 Aurélien Gâteau -License: LGPL-2.1 | LGPL-3 +Copyright: + 2009-2010, Ted Gould , Canonical Ltd. +License: LGPL-2.1 or LGPL-3 -Files: tools/{dbusmenu-bench,testapp/main.c} -Copyright: 2009-2010 Aurélien Gâteau -License: LGPL-2.1 | LGPL-3 +Files: tools/dbusmenu-bench + tools/testapp/main.c +Copyright: + 2009-2010, Aurélien Gâteau +License: LGPL-2.1 or LGPL-3 Files: debian/* -Copyright: 2009-2010 Evgeni Golov -Copyright: 2009-2010 Ted Gould , Canonical Ltd. -Copyright: 2009-2010 Sebastien Bacher -Copyright: 2009-2010 Ken VanDine +Copyright: + 2009-2010, Evgeni Golov + 2009-2010, Ted Gould , Canonical Ltd. + 2009-2010, Sebastien Bacher + 2009-2010, Ken VanDine + 2017, Mike Gabriel License: GPL-3 +Files: debian/patches/* +Copyright: + 2017, Mike Gabriel +License: LGPL-2.1 or LGPL-3 + License: GPL-3 - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in `/usr/share/common-licenses/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, write to the Free Software Foundation, Inc., 51 + Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + . + On Debian systems, the complete text of the GNU General Public License + version 3 can be found in `/usr/share/common-licenses/GPL-3'. License: LGPL-2.1 - On Debian systems, the complete text of the GNU Lesser General - Public License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; version 2.1 + of the License. + . + 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 + Library General Public License for more details. + . + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + See /usr/share/common-licenses/LGPL-2.1 for the full license text. License: LGPL-3 - On Debian systems, the complete text of the GNU Lesser General - Public License version 3 can be found in `/usr/share/common-licenses/LGPL-3'. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; version 3 + of the License. + . + 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 + Library General Public License for more details. + . + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + See /usr/share/common-licenses/LGPL-3 for the full license text. diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install index bc5b5b1..7277e70 100644 --- a/debian/libdbusmenu-glib-dev.install +++ b/debian/libdbusmenu-glib-dev.install @@ -1,6 +1,6 @@ usr/include/libdbusmenu-glib-0.4/libdbusmenu-glib -usr/lib/*/pkgconfig/dbusmenu-glib-0.4.pc usr/lib/*/libdbusmenu-glib.a usr/lib/*/libdbusmenu-glib.so +usr/lib/*/pkgconfig/dbusmenu-glib-0.4.pc usr/share/gir-1.0/Dbusmenu-0.4.gir usr/share/vala/vapi/Dbusmenu-0.4.vapi diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install index a17a99f..d5a9e1c 100644 --- a/debian/libdbusmenu-gtk-dev.install +++ b/debian/libdbusmenu-gtk-dev.install @@ -1,6 +1,6 @@ usr/include/libdbusmenu-gtk-0.4/libdbusmenu-gtk -usr/lib/*/pkgconfig/dbusmenu-gtk-0.4.pc usr/lib/*/libdbusmenu-gtk.a usr/lib/*/libdbusmenu-gtk.so +usr/lib/*/pkgconfig/dbusmenu-gtk-0.4.pc usr/share/gir-1.0/DbusmenuGtk-0.4.gir usr/share/vala/vapi/DbusmenuGtk-0.4.vapi diff --git a/debian/libdbusmenu-gtk-doc.install b/debian/libdbusmenu-gtk-doc.install index d772ba5..db11db8 100644 --- a/debian/libdbusmenu-gtk-doc.install +++ b/debian/libdbusmenu-gtk-doc.install @@ -1,2 +1,2 @@ -usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/ usr/share/doc/libdbusmenu/examples/glib-server-nomenu.c +usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/ diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install index 782f5c8..8120260 100644 --- a/debian/libdbusmenu-gtk3-dev.install +++ b/debian/libdbusmenu-gtk3-dev.install @@ -1,6 +1,6 @@ usr/include/libdbusmenu-gtk3-0.4/libdbusmenu-gtk -usr/lib/*/pkgconfig/dbusmenu-gtk3-0.4.pc usr/lib/*/libdbusmenu-gtk3.a usr/lib/*/libdbusmenu-gtk3.so +usr/lib/*/pkgconfig/dbusmenu-gtk3-0.4.pc usr/share/gir-1.0/DbusmenuGtk3-0.4.gir usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install index 1554085..e097900 100644 --- a/debian/libdbusmenu-jsonloader-dev.install +++ b/debian/libdbusmenu-jsonloader-dev.install @@ -1,4 +1,4 @@ usr/include/libdbusmenu-glib-0.4/libdbusmenu-jsonloader -usr/lib/*/pkgconfig/dbusmenu-jsonloader-0.4.pc usr/lib/*/libdbusmenu-jsonloader.a usr/lib/*/libdbusmenu-jsonloader.so +usr/lib/*/pkgconfig/dbusmenu-jsonloader-0.4.pc diff --git a/debian/libdbusmenu-tools.install b/debian/libdbusmenu-tools.install index 68962f8..1f3c7e6 100644 --- a/debian/libdbusmenu-tools.install +++ b/debian/libdbusmenu-tools.install @@ -1,3 +1,3 @@ usr/lib/*/dbusmenu-* -usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/ usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/ +usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/ diff --git a/debian/patches/0001_no-deprecated-gnome-common-macros.patch b/debian/patches/0001_no-deprecated-gnome-common-macros.patch new file mode 100644 index 0000000..fbe7ca3 --- /dev/null +++ b/debian/patches/0001_no-deprecated-gnome-common-macros.patch @@ -0,0 +1,12 @@ +Description: Drop deprecated gnome-common variables. +Author: Mike Gabriel + +--- a/autogen.sh ++++ b/autogen.sh +@@ -9,6 +9,4 @@ + + gtkdocize || exit 1 + +-USE_GNOME2_MACROS=1 \ +-USE_COMMON_DOC_BUILD=yes \ + gnome-autogen.sh --enable-gtk-doc $@ diff --git a/debian/patches/README b/debian/patches/README new file mode 100644 index 0000000..80c1584 --- /dev/null +++ b/debian/patches/README @@ -0,0 +1,3 @@ +0xxx: Grabbed from upstream development. +1xxx: Possibly relevant for upstream adoption. +2xxx: Only relevant for official Debian release. diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..4b9e9f9 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001_no-deprecated-gnome-common-macros.patch diff --git a/debian/rules b/debian/rules index 5534dfa..ed8efe5 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,9 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + FLAVORS = gtk2 gtk3 CONFIGURE_FLAGS_gtk2 = --with-gtk=2 @@ -7,7 +11,8 @@ CONFIGURE_FLAGS_gtk3 = --with-gtk=3 CONFIGURE_COMMON_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) -INSTALL_COMMON_FLAGS = --fail-missing +INSTALL_COMMON_FLAGS = +MISSING_COMMON_FLAGS = --fail-missing LDFLAGS += -Wl,-z,defs -Wl,--as-needed @@ -30,10 +35,14 @@ dobuild-%: override_dh_auto_install: $(FLAVORS:%=doinstall-%) doinstall-%: - dh_auto_install --builddirectory=builddir/$* --destdir=debian/tmp/$* + dh_auto_install --no-parallel --builddirectory=builddir/$* --destdir=debian/tmp/$* override_dh_auto_test: $(FLAVORS:%=dotest-%) +override_dh_auto_clean: + dh_auto_clean + rm -Rvf builddir/ + dotest-%: ifeq ($(DEB_HOST_ARCH),ppc64el) : # ignore the test results on $(DEB_HOST_ARCH) @@ -42,6 +51,22 @@ else VERBOSE=1 xvfb-run -a dh_auto_test --builddirectory=builddir/$* endif +override_dh_missing: + dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-gtk4 --sourcedir=debian/tmp/gtk2 + dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-gtk-dev --sourcedir=debian/tmp/gtk2 + dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-gtk-doc --sourcedir=debian/tmp/gtk2 + dh_missing $(MISSING_COMMON_FLAGS) -pgir1.2-dbusmenu-gtk-0.4 --sourcedir=debian/tmp/gtk2 + dh_missing $(MISSING_COMMON_FLAGS) -pgir1.2-dbusmenu-glib-0.4 --sourcedir=debian/tmp/gtk3 + dh_missing $(MISSING_COMMON_FLAGS) -pgir1.2-dbusmenu-gtk3-0.4 --sourcedir=debian/tmp/gtk3 + dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-glib4 --sourcedir=debian/tmp/gtk3 + dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-glib-dev --sourcedir=debian/tmp/gtk3 + dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-glib-doc --sourcedir=debian/tmp/gtk3 + dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-gtk3-4 --sourcedir=debian/tmp/gtk3 + dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-gtk3-dev --sourcedir=debian/tmp/gtk3 + dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-jsonloader4 --sourcedir=debian/tmp/gtk3 + dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-jsonloader-dev --sourcedir=debian/tmp/gtk3 + dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-tools --sourcedir=debian/tmp/gtk3 + override_dh_install: find debian/tmp -name \*.la -delete # Remove gtk2 copies of dbusmenu-tools (we use the gtk3 build) @@ -66,4 +91,9 @@ override_dh_install: override_dh_shlibdeps: dh_shlibdeps -plibdbusmenu-gtk4 -- -xlibgtk2.0-0 dh_shlibdeps -plibdbusmenu-gtk3-4 -- -xlibgtk-3-0 + dh_shlibdeps -plibdbusmenu-glib4 + dh_shlibdeps -plibdbusmenu-jsonloader4 + dh_shlibdeps -plibdbusmenu-tools +get-orig-source: + uscan --noconf --force-download --rename --download-current-version --destdir=.. diff --git a/debian/source/format b/debian/source/format index d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) diff --git a/debian/watch b/debian/watch index 9f089a5..6a03abd 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://launchpad.net/dbusmenu/+download .*/libdbusmenu-([0-9.]+)\.tar\.gz +http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbusmenu/libdbusmenu_([0-9.\+]+).orig.tar.gz -- cgit v1.2.3