aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-02-08 16:40:57 -0500
committerKen VanDine <ken.vandine@canonical.com>2011-02-08 16:40:57 -0500
commitd0ad1b8460f6ea1a1c408b047590e33299e93591 (patch)
treece3786c6ffbb30dff52e653c25c24700647a4d8d /debian
parentc7907613764c57dc8f423e9f75f703f75586152b (diff)
downloadlibayatana-appindicator-d0ad1b8460f6ea1a1c408b047590e33299e93591.tar.gz
libayatana-appindicator-d0ad1b8460f6ea1a1c408b047590e33299e93591.tar.bz2
libayatana-appindicator-d0ad1b8460f6ea1a1c408b047590e33299e93591.zip
gtk3 packaging fixes, still wip
Diffstat (limited to 'debian')
-rw-r--r--debian/control67
-rwxr-xr-xdebian/rules82
2 files changed, 60 insertions, 89 deletions
diff --git a/debian/control b/debian/control
index 7ed1cb9..a675dea 100644
--- a/debian/control
+++ b/debian/control
@@ -66,8 +66,7 @@ Conflicts: gir1.0-appindicator-0.1
Replaces: gir1.0-appindicator-0.1
Section: libs
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
+Depends: ${misc:Depends},
${gir:Depends}
Description: Typelib files for libappindicator1.
.
@@ -99,37 +98,6 @@ Description: Application Indicators
.
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: libappindicator3-1
Section: libs
Architecture: any
@@ -159,13 +127,40 @@ Description: Application Indicators
Package: gir1.2-appindicator3-0.1
Section: libs
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
+Depends: ${misc:Depends},
${gir:Depends}
Description: Typelib files for libappindicator3-1.
.
This package can be used by other packages using the GIRepository format
to generate dynamic bindings.
+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.
diff --git a/debian/rules b/debian/rules
index 08ea5b5..edb1a2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+export DH_VERBOSE = 1
+
DEB_SRCDIR = .
DEB_BUILDDIR = $(DEB_SRCDIR)/build
@@ -34,13 +36,30 @@ 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-install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS))
+
+configure-stamp:
+ cd $(DEB_BUILDDIR) && \
+ $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) --enable-gtk-doc
+ touch $@
+
+configure/libappindicator1:: configure-stamp
+
+build-stamp:
+ $(MAKE) -C $(DEB_BUILDDIR)
+ touch $@
+
+build/libappindicator1:: build-stamp
-stamp-configure-gtk3:
+install-stamp:
+ $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp
+ touch $@
+
+binary-install/libappindicator1:: install-stamp install-gtk3-stamp
+
+configure-gtk3-stamp:
: # configure for GTK+ 3.0
set -e; \
rm -rf build-gtk3; \
@@ -52,64 +71,23 @@ stamp-configure-gtk3:
cd ..;
touch $@
-configure/libappindicator3-1:: stamp-configure-gtk3
+configure/libappindicator3-1:: configure-gtk3-stamp
-stamp-build-gtk3:
+build-gtk3-stamp:
: # build for GTK+ 3.0
$(MAKE) -C build-gtk3/src;
touch $@
-build/libappindicator3-1:: stamp-build-gtk3
+build/libappindicator3-1:: build-gtk3-stamp
-stamp-install-gtk3:
+install-gtk3-stamp:
: # install for GTK+ 3.0
$(MAKE) -C build-gtk3/src DESTDIR=$(CURDIR)/debian/tmp install
- dh_installdirs -plibappindicator3-1 -s
- dh_installdirs -plibappindicator3-dev -s
- dh_installdirs -pgir1.2-appindicator3-0.1 -s
- dh_install -plibappindicator3-1 -s
- dh_install -plibappindicator3-dev -s
- dh_install -pgir1.2-appindicator3-0.1 -s
- touch $@
-
-binary-install/libappindicator3-1:: stamp-install-gtk3
-
-configure-stamp:
- cd $(DEB_BUILDDIR) && \
- $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) --enable-gtk-doc
- touch $@
-
-configure/libappindicator1:: configure-stamp
-
-build-stamp:
- $(MAKE) -C $(DEB_BUILDDIR)
- touch $@
-
-build/libappindicator1:: build-stamp
-
-install-stamp:
- $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp
- dh_installdirs -plibappindicator1 -s
- dh_installdirs -plibappindicator-dev -s
- dh_installdirs -plibappindicator-doc -s
- dh_installdirs -pgir1.2-appindicator-0.1 -s
- dh_install -plibappindicator1 -s
- dh_install -plibappindicator-dev -s
- dh_install -plibappindicator-doc -s
- dh_install -pgir1.2-appindicator-0.1 -s
touch $@
-binary-install/libappindicator1:: install-stamp
+binary-install/libappindicator3-1:: install-gtk3-stamp
-binary-predeb/libappindicator1::
- dh_fixperms
- dh_strip
-
-binary-predeb/libappindicator3-1:: binary-install/libappindicator3-1
- dh_fixperms
- dh_strip
-
-binary-install/libappindicator0.1-cil:: binary-install/libappindicator1
+binary-install/libappindicator0.1-cil:: binary-fixup/libappindicator1
dh_clistrip
dh_clifixperms
dh_makeclilibs -V
@@ -126,8 +104,6 @@ binary-predeb/python-appindicator::
find debian/python-appindicator/usr/lib -name \*.la -exec rm {} \;
find debian/python-appindicator/usr/lib -name \*.a -exec rm {} \;
-common-install-prehook-arch:: binary-install/libappindicator3-1
-
common-binary-predeb-arch:: list-missing
dh_fixperms
dh_strip