diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 22 | ||||
| -rw-r--r-- | debian/control | 118 | ||||
| -rw-r--r-- | debian/copyright | 36 | ||||
| -rw-r--r-- | debian/gir1.2-appindicator-0.1.install | 1 | ||||
| -rw-r--r-- | debian/indicator-application.install | 4 | ||||
| -rw-r--r-- | debian/libappindicator-dev.install | 5 | ||||
| -rw-r--r-- | debian/libappindicator-doc.install | 1 | ||||
| -rw-r--r-- | debian/libappindicator0.1-cil-dev.install | 1 | ||||
| -rw-r--r-- | debian/libappindicator0.1-cil.install | 1 | ||||
| -rw-r--r-- | debian/libappindicator0.1-cil.installcligac | 3 | ||||
| -rw-r--r-- | debian/libappindicator1.install | 1 | ||||
| -rw-r--r-- | debian/python-appindicator.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 92 |
13 files changed, 31 insertions, 256 deletions
diff --git a/debian/changelog b/debian/changelog index 31c80a6..6b028cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +indicator-application (0.2.91-0ubuntu1) natty; urgency=low + + [ Ted Gould ] + * Upstream Merge + * Removing libappindicator from the tarball + * debian/control: Removing all libappindicator packages + + [ Ken VanDine ] + * New upstream release + - Ported to gdbus and dbusmenu 0.4 + * debian/control + - Bump build depends for dbusmenu to >= 0.3.91 + - Bump build depends for libindicator-dev to >= 0.3.16 + - Added build depends for libappindicator-dev >= 0.2.91 + * debian/rules + - Removed all the extra build targets, we don't build those + packages anymore + * debian/copyright + - Removed references to LGPL sources, those moved to libappindicator + + -- Ken VanDine <ken.vandine@canonical.com> Fri, 14 Jan 2011 10:25:42 -0600 + indicator-application (0.2.90-0ubuntu4) natty; urgency=low * Updated for the gir abi transition diff --git a/debian/control b/debian/control index 02ca13c..62a270e 100644 --- a/debian/control +++ b/debian/control @@ -8,45 +8,15 @@ Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev (>= 0.82), libjson-glib-dev, - gnome-doc-utils, - gtk-doc-tools, intltool, - python-all-dev, - python-gtk2-dev, - libindicate-dev (>= 0.2.0), - libindicate-gtk-dev (>= 0.2.0), - libindicator-dev (>= 0.3.14), - libdbusmenu-gtk-dev (>= 0.3.90), - libdbusmenu-glib-dev (>= 0.3.90), - cli-common-dev (>= 0.5.7), - mono-devel (>= 2.4.3), - gtk-sharp2-gapi, - libmono-dev, - libnunit-cil-dev, - libgtk2.0-cil-dev, - gobject-introspection, - libgirepository1.0-dev, - gir1.2-glib-2.0, - gir1.2-gtk-2.0, - valac-0.12 + libindicator-dev (>= 0.3.16), + libdbusmenu-gtk-dev (>= 0.3.91), + libdbusmenu-glib-dev (>= 0.3.91), + libappindicator-dev (>= 0.2.91) Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu -Package: python-appindicator -Section: python -Architecture: any -XB-Python-Version: ${python:Versions} -Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${python:Depends}, - libappindicator1 (= ${binary:Version}), - python-gobject -Provides: ${python:Provides} -Description: Python bindings for libappindicator - This package provides Python bindings so that you can use libappindicator from - a Python program. - Package: indicator-application Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -54,83 +24,3 @@ Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. -Package: libappindicator1 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} -Recommends: indicator-application (= ${binary:Version}) -Description: Application Indicators - A library and indicator to take menus from applications and place them in - the panel. - . - This package contains shared libraries to be used by applications. - -Package: libappindicator-dev -Section: libdevel -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libdbusmenu-glib-dev (>= 0.1.8), - libdbus-glib-1-dev (>= 0.76), - libappindicator1 (= ${binary:Version}) -Description: Application Indicators - A library and indicator to take menus from applications and place them in - the panel. - . - This package contains files that are needed to build applications. - -Package: libappindicator-doc -Section: doc -Architecture: all -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: Application Indicators - A library and indicator to take menus from applications and place them in - the panel. - . - This package contains developer documentation. - -Package: libappindicator0.1-cil -Section: cli-mono -Architecture: all -Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4), - libappindicator0.0-cil (<= 0.2.0-0ubuntu4) -Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4) -Provides: libappindicator0.0-cil -Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${cli:Depends} -Description: CLI bindings for libappindicator - This package provides the appindicator-sharp assembly that allows CLI (.NET) - programs to take menus from applications and place them in the panel. - . - This package contains assemblies to be used by applications. - -Package: libappindicator0.1-cil-dev -Section: libdevel -Architecture: all -Replaces: libappindicator-cil-dev (<= 0.0.19-0ubuntu4) -Conflicts: libappindicator-cil-dev (<= 0.0.19-0ubuntu4) -Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${cli:Depends}, - libappindicator0.1-cil (= ${binary:Version}) -Description: Application Indicators - A library and indicator to take menus from applications and place them in - the panel. - . - This package contains files that are needed to build applications. - -Package: gir1.2-appindicator-0.1 -Conflicts: gir1.0-appindicator-0.1 -Replaces: gir1.0-appindicator-0.1 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${gir:Depends} -Description: Typelib files for libappindicator1. - . - This package can be used by other packages using the GIRepository format - to generate dynamic bindings. diff --git a/debian/copyright b/debian/copyright index ba92c05..fcfcc8a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,7 +9,7 @@ Upstream Author: Copyright: - Copyright (C) 2009 Canonical Ltd. + Copyright (C) 2009-2010 Canonical Ltd. License: @@ -26,35 +26,5 @@ License: along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -Two files (app-indicator.c and app-indicator.h) are under: - - 1) the GNU Lesser General Public License version 3, as published by the - Free Software Foundation; and/or - 2) the GNU Lesser General Public License version 2.1, 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. - - This library 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.1 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. - - You should have received a copy of the GNU Lesser 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 - -On Debian/Ubuntu systems, the full text of the LGPL v2.1 can be found in -`/usr/share/common-licenses/LGPL-2.1', the full text of the LGPL v3 can be found in -`/usr/share/common-licenses/LGPL-3, and the full text of the GPL v3 can be -found in `/usr/share/common-licenses/GPL-3' +On Debian/Ubuntu systems, the full text of the GPL v3 can be found in +`/usr/share/common-licenses/GPL-3' diff --git a/debian/gir1.2-appindicator-0.1.install b/debian/gir1.2-appindicator-0.1.install deleted file mode 100644 index 0791348..0000000 --- a/debian/gir1.2-appindicator-0.1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/girepository-1.0/* diff --git a/debian/indicator-application.install b/debian/indicator-application.install deleted file mode 100644 index c525a81..0000000 --- a/debian/indicator-application.install +++ /dev/null @@ -1,4 +0,0 @@ -debian/tmp/usr/lib/indicators/* -debian/tmp/usr/lib/indicator-application/indicator-application-service -debian/tmp/usr/share/dbus-1/services/indicator-application.service -debian/tmp/usr/share/indicator-application/ordering-override.keyfile diff --git a/debian/libappindicator-dev.install b/debian/libappindicator-dev.install deleted file mode 100644 index 28598a4..0000000 --- a/debian/libappindicator-dev.install +++ /dev/null @@ -1,5 +0,0 @@ -debian/tmp/usr/include/libappindicator-0.1/* -debian/tmp/usr/lib/libappindicator.so -debian/tmp/usr/lib/pkgconfig/appindicator-0.1.pc -debian/tmp/usr/share/gir-1.0/* -debian/tmp/usr/share/vala/vapi/* diff --git a/debian/libappindicator-doc.install b/debian/libappindicator-doc.install deleted file mode 100644 index 313fe33..0000000 --- a/debian/libappindicator-doc.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/share/gtk-doc/html/libappindicator/* diff --git a/debian/libappindicator0.1-cil-dev.install b/debian/libappindicator0.1-cil-dev.install deleted file mode 100644 index 6185943..0000000 --- a/debian/libappindicator0.1-cil-dev.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/pkgconfig/appindicator-sharp-0.1.pc diff --git a/debian/libappindicator0.1-cil.install b/debian/libappindicator0.1-cil.install deleted file mode 100644 index 106b727..0000000 --- a/debian/libappindicator0.1-cil.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/cli/appindicator-sharp-0.1/* diff --git a/debian/libappindicator0.1-cil.installcligac b/debian/libappindicator0.1-cil.installcligac deleted file mode 100644 index f3e5bfc..0000000 --- a/debian/libappindicator0.1-cil.installcligac +++ /dev/null @@ -1,3 +0,0 @@ -/usr/lib/cli/appindicator-sharp-0.1/appindicator-sharp.dll -/usr/lib/cli/appindicator-sharp-0.1/policy.0.0.appindicator-sharp.dll -/usr/lib/cli/appindicator-sharp-0.1/policy.0.1.appindicator-sharp.dll diff --git a/debian/libappindicator1.install b/debian/libappindicator1.install deleted file mode 100644 index a0b5976..0000000 --- a/debian/libappindicator1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libappindicator.so.* diff --git a/debian/python-appindicator.install b/debian/python-appindicator.install deleted file mode 100644 index 00bdd51..0000000 --- a/debian/python-appindicator.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/python2.* -debian/tmp/usr/share/pygtk/* diff --git a/debian/rules b/debian/rules index cfb2f4b..80009dd 100755 --- a/debian/rules +++ b/debian/rules @@ -1,97 +1,9 @@ #!/usr/bin/make -f -DEB_SRCDIR = . -DEB_BUILDDIR = $(DEB_SRCDIR)/build - -DEB_PYTHON_SYSTEM=dh_python2 -PY_VERSIONS = $(shell pyversions --requested debian/control) -export MONO_SHARED_DIR=$(CURDIR) -export CSC=/usr/bin/mono-csc - include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools-vars.mk +include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc -API_VERSION = 0.1 - -DEB_DH_MAKESHLIBS_ARGS_libappindicator1 := -V 'libappindicator1 (>= 0.0.19)' - -configure-stamp-%: - mkdir build-$* - cd build-$* && PYTHON=`which $*` \ - $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) --srcdir=.. - touch $@ - -configure/python-appindicator:: $(addprefix configure-stamp-, $(PY_VERSIONS)) - -build-stamp-%: - PYTHON=`which $*` \ - $(MAKE) -C build-$* - touch $@ - -build/python-appindicator:: $(addprefix build-stamp-, $(PY_VERSIONS)) - -install-stamp-%: - PYTHON=`which $*` \ - $(MAKE) -C build-$*/bindings/python install DESTDIR=$(CURDIR)/debian/tmp - dh_installdirs -ppython-appindicator -s - dh_install -ppython-appindicator -s - touch $@ - -install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS)) - -binary-predeb/python-appindicator:: - dh_python2 -ppython-appindicator - find debian/python-appindicator/usr/lib -name \*.la -exec rm {} \; - find debian/python-appindicator/usr/lib -name \*.a -exec rm {} \; - -binary-install/libappindicator0.1-cil:: - dh_clistrip - dh_clifixperms - dh_makeclilibs -V - dh_installcligac - -binary-predeb/gir1.0-appindicator-0.1:: - dh_girepository -p$(cdbs_curpkg) - -binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator1 - dh_clideps -plibappindicator0.1-cil - -configure-stamp: - cd $(DEB_BUILDDIR) && \ - $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) - touch $@ - -configure/indicator-application:: configure-stamp - -build-stamp: - $(MAKE) -C $(DEB_BUILDDIR) - touch $@ - -build/indicator-application:: build-stamp - -install-stamp: - $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp - touch $@ - -install/indicator-application:: install-stamp - -binary-predeb/libappindicator1:: install-stamp - dh_fixperms - dh_strip - -binary-post-install/indicator-application:: - find debian/indicator-application/usr/lib -name \*.la -exec rm {} \; - find debian/indicator-application/usr/lib -name \*.a -exec rm {} \; +LDFLAGS += -Wl,-z,defs -Wl,--as-needed common-binary-predeb-arch:: list-missing - dh_fixperms - dh_strip - -clean:: - -rm -rf $(addprefix build-, $(PY_VERSIONS)) - -rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS)) - -rm -rf $(addprefix build-stamp-, $(PY_VERSIONS)) - -rm -rf $(addprefix install-stamp-, $(PY_VERSIONS)) - rm -rf $(MONO_SHARED_DIR)/.wapi |