From 04a9942b4d950964f74e3bfcc09ca9cefe15d600 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 16 Apr 2010 17:24:51 -0500 Subject: Patch for package names --- debian/changelog | 25 +++++++++++++++++++++++++ debian/control | 15 +++++++++------ debian/libappindicator-cil-dev.install | 1 - debian/libappindicator0-cil.install | 1 - debian/libappindicator0-cil.installcligac | 1 - debian/libappindicator0.0-cil.install | 1 + debian/libappindicator0.0-cil.installcligac | 1 + debian/libappindicator0.1-cil-dev.install | 1 + debian/rules | 21 ++++++++++++--------- 9 files changed, 49 insertions(+), 18 deletions(-) delete mode 100644 debian/libappindicator-cil-dev.install delete mode 100644 debian/libappindicator0-cil.install delete mode 100644 debian/libappindicator0-cil.installcligac create mode 100644 debian/libappindicator0.0-cil.install create mode 100644 debian/libappindicator0.0-cil.installcligac create mode 100644 debian/libappindicator0.1-cil-dev.install (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 385872b..33e4127 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,28 @@ +indicator-application (0.0.19-0ubuntu4) UNRELEASED; urgency=low + + * bindings/mono/appindicator-sharp-0.1.pc.in: + + Fix pcfile to point to library install location (LP: #564506) + * debian/control, + debian/libappindicator0-cil.install, + debian/libappindicator0-cil.installcligac, + debian/libappindicator-cil-dev.install, + debian/libappindicator0.0-cil.install, + debian/libappindicator0.0-cil.installcligac, + debian/libappindicator0.1-cil-dev.install: + + Rename packages to comply with Debian CLI policy + * debian/libappindicator0.0-cil.install, + debian/libappindicator0.0-cil.installcligac: + + Fix library install location to comply with Debian CLI policy + * debian/control, + debian/rules: + + Pass CSC variable to use mono-csc default compiler from mono-devel + 2.4.3, rather than the default 2.0-only compiler + * debian/rules: + + Fix processing of rules to track dependency information on Mono + binding, by running rules in correct order + + -- Jo Shields Fri, 16 Apr 2010 10:42:48 +0100 + indicator-application (0.0.19-0ubuntu3) lucid; urgency=low * Merging patch to add assembly information to Mono binding (LP: #547195) diff --git a/debian/control b/debian/control index e64f6ad..64ca500 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 5.0), libdbusmenu-gtk-dev (>= 0.2.2), libdbusmenu-glib-dev (>= 0.2.2), cli-common-dev (>= 0.5.7), - mono-devel (>= 2.0.1), + mono-devel (>= 2.4.3), gtk-sharp2-gapi, libmono-dev, libnunit-cil-dev, @@ -87,26 +87,29 @@ Description: Application Indicators . This package contains developer documentation. -Package: libappindicator0-cil +Package: libappindicator0.0-cil Section: cli-mono Architecture: all +Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4~) +Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4~) Depends: ${shlibs:Depends}, ${misc:Depends}, - ${cli:Depends}, - libappindicator0 (>= ${source:Version}) + ${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: libappindicator-cil-dev +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-cil (= ${binary:Version}) + libappindicator0.0-cil (= ${binary:Version}) Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. diff --git a/debian/libappindicator-cil-dev.install b/debian/libappindicator-cil-dev.install deleted file mode 100644 index 6185943..0000000 --- a/debian/libappindicator-cil-dev.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/pkgconfig/appindicator-sharp-0.1.pc diff --git a/debian/libappindicator0-cil.install b/debian/libappindicator0-cil.install deleted file mode 100644 index 6382d9e..0000000 --- a/debian/libappindicator0-cil.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/appindicator-sharp-0.1 /usr/lib/cli diff --git a/debian/libappindicator0-cil.installcligac b/debian/libappindicator0-cil.installcligac deleted file mode 100644 index 7e66dd2..0000000 --- a/debian/libappindicator0-cil.installcligac +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/cli/appindicator-sharp-0.1/appindicator-sharp.dll diff --git a/debian/libappindicator0.0-cil.install b/debian/libappindicator0.0-cil.install new file mode 100644 index 0000000..994d951 --- /dev/null +++ b/debian/libappindicator0.0-cil.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/appindicator-sharp-0.1/* /usr/lib/cli/appindicator-sharp-0.0 diff --git a/debian/libappindicator0.0-cil.installcligac b/debian/libappindicator0.0-cil.installcligac new file mode 100644 index 0000000..b818d51 --- /dev/null +++ b/debian/libappindicator0.0-cil.installcligac @@ -0,0 +1 @@ +/usr/lib/cli/appindicator-sharp-0.0/appindicator-sharp.dll diff --git a/debian/libappindicator0.1-cil-dev.install b/debian/libappindicator0.1-cil-dev.install new file mode 100644 index 0000000..6185943 --- /dev/null +++ b/debian/libappindicator0.1-cil-dev.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/pkgconfig/appindicator-sharp-0.1.pc diff --git a/debian/rules b/debian/rules index 2fe0be6..e2e4215 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ DEB_PYTHON_SYSTEM=pycentral 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 @@ -12,6 +13,8 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc API_VERSION = 0.1 +DEB_DH_MAKESHLIBS_ARGS_libappindicator0 := -V 'libappindicator0 (>= 0.0.19)' + configure-stamp-%: mkdir build-$* cd build-$* && PYTHON=`which $*` \ @@ -35,6 +38,15 @@ install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS)) binary-install/python-appindicator:: dh_pycentral +binary-install/libappindicator0.0-cil:: + dh_clistrip + dh_clifixperms + dh_makeclilibs -V + dh_installcligac + +binary-predeb/libappindicator0.0-cil:: binary-fixup/libappindicator0 + dh_clideps -plibappindicator0.0-cil + configure-stamp: $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) touch $@ @@ -57,15 +69,6 @@ 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 {} \; -binary-fixup/libappindicator0-cil:: - dh_clifixperms - -binary-predeb/libappindicator0-cil:: - dh_makeclilibs -m $(API_VERSION) - dh_installcligac - dh_clideps - - common-binary-predeb-arch:: list-missing clean:: -- cgit v1.2.3