[Pkg-cli-apps-commits] r3635 - in /packages/beagle-xesam/trunk/debian: beagle-xesam.dirs beagle-xesam.install beagle.dirs beagle.install control patches/00list patches/link_system_libs.dpatch rules

jsogo at users.alioth.debian.org jsogo at users.alioth.debian.org
Wed Dec 26 23:48:47 UTC 2007 

Author: jsogo
Date: Wed Dec 26 23:48:47 2007
New Revision: 3635

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3635
Log:
beagle-xesam
 + Another iteration on beagle-xesam packaging
 + Remove all -arch rules
 + Add a patch to link with external ndesk-dbus library
 + Rename instructions files from beagle to beagle-xesam
 + Add some more dependencies (libglib2.0-cil and libndesk-dbus-glib1.0-cil)

Added:
    packages/beagle-xesam/trunk/debian/beagle-xesam.dirs
      - copied unchanged from r3634, packages/beagle-xesam/trunk/debian/beagle.dirs
    packages/beagle-xesam/trunk/debian/beagle-xesam.install
      - copied unchanged from r3634, packages/beagle-xesam/trunk/debian/beagle.install
    packages/beagle-xesam/trunk/debian/patches/00list
    packages/beagle-xesam/trunk/debian/patches/link_system_libs.dpatch   (with props)
Removed:
    packages/beagle-xesam/trunk/debian/beagle.dirs
    packages/beagle-xesam/trunk/debian/beagle.install
Modified:
    packages/beagle-xesam/trunk/debian/control
    packages/beagle-xesam/trunk/debian/rules

Modified: packages/beagle-xesam/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle-xesam/trunk/debian/control?rev=3635&op=diff
==============================================================================
--- packages/beagle-xesam/trunk/debian/control (original)
+++ packages/beagle-xesam/trunk/debian/control Wed Dec 26 23:48:47 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), cli-common-dev (>= 0.4.4), dpatch, intltool, mono-gmcs (>= 1.2.4) | c-sharp-2.0-compiler, beagle-dev
+Build-Depends: debhelper (>= 5.0.37.2), cli-common-dev (>= 0.4.4), dpatch, intltool, mono-gmcs (>= 1.2.4) | c-sharp-2.0-compiler, libglib2.0-cil, beagle-dev, libndesk-dbus-glib1.0-cil
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/beagle-xesam/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle-xesam/trunk/
@@ -12,5 +12,5 @@
 Package: beagle-xesam
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
-Description: xesam adaptor for Beagle 
+Description: xesam API/support for Beagle 
  This package provides a Xesam adaptor for Beagle indexing tool.

Added: packages/beagle-xesam/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle-xesam/trunk/debian/patches/00list?rev=3635&op=file
==============================================================================
--- packages/beagle-xesam/trunk/debian/patches/00list (added)
+++ packages/beagle-xesam/trunk/debian/patches/00list Wed Dec 26 23:48:47 2007
@@ -1,0 +1,1 @@
+link_system_libs.dpatch

Added: packages/beagle-xesam/trunk/debian/patches/link_system_libs.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle-xesam/trunk/debian/patches/link_system_libs.dpatch?rev=3635&op=file
==============================================================================
--- packages/beagle-xesam/trunk/debian/patches/link_system_libs.dpatch (added)
+++ packages/beagle-xesam/trunk/debian/patches/link_system_libs.dpatch Wed Dec 26 23:48:47 2007
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## link_system_libs.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad beagle-xesam-0.1~/src/Makefile.am beagle-xesam-0.1/src/Makefile.am
+--- beagle-xesam-0.1~/src/Makefile.am	2007-11-20 03:48:46.000000000 +0100
++++ beagle-xesam-0.1/src/Makefile.am	2007-12-27 00:26:06.000000000 +0100
+@@ -29,7 +29,7 @@
+ GLIBSHARP_ASSEMBLIES = ${GLIBSHARP_LIBS}
+ 
+ DBUS_ASSEMBLIES = 				\
+-	-r:$(DBUS_SHARP_DIR)/NDesk.DBus.dll
++	$(shell pkg-config --libs ndesk-dbus-1.0)
+ 
+ BEAGLE_ASSEMBLIES = ${BEAGLE_LIBS}
+ 
+diff -urNad beagle-xesam-0.1~/src/Makefile.in beagle-xesam-0.1/src/Makefile.in
+--- beagle-xesam-0.1~/src/Makefile.in	2007-12-01 23:59:25.000000000 +0100
++++ beagle-xesam-0.1/src/Makefile.in	2007-12-27 00:26:40.000000000 +0100
+@@ -168,7 +168,7 @@
+ 
+ GLIBSHARP_ASSEMBLIES = ${GLIBSHARP_LIBS}
+ DBUS_ASSEMBLIES = \
+-	-r:$(DBUS_SHARP_DIR)/NDesk.DBus.dll
++	$(shell pkg-config --libs ndesk-dbus-1.0)
+ 
+ BEAGLE_ASSEMBLIES = ${BEAGLE_LIBS}
+ XESAMADAPTOR_ASSEMBLIES = $(DBUS_ASSEMBLIES)		\

Propchange: packages/beagle-xesam/trunk/debian/patches/link_system_libs.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/beagle-xesam/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle-xesam/trunk/debian/rules?rev=3635&op=diff
==============================================================================
--- packages/beagle-xesam/trunk/debian/rules (original)
+++ packages/beagle-xesam/trunk/debian/rules Wed Dec 26 23:48:47 2007
@@ -49,32 +49,26 @@
 
 	dh_clean 
 
-install: build-stamp install-arch install-indep
+install: build-stamp install-indep
 
-install-arch:
+install-indep:
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
-	dh_installdirs -a
+	dh_installdirs -i
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-	dh_install -a --sourcedir=debian/tmp
+	dh_install -i --sourcedir=debian/tmp
 	
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	find debian/ -type f -name "*.mdb" -delete
 endif
 
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_installdirs -i
-	dh_install -i --sourcedir=debian/tmp
-
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs -i ChangeLog
+#	dh_installchangelogs -i ChangeLog
+	dh_installchangelogs
 	dh_installdocs -i
 	dh_installmenu -i
 	dh_makeclilibs -m 1.0 -i
@@ -90,27 +84,6 @@
 	dh_md5sums -i
 	dh_builddeb -i
 	
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -a ChangeLog
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installmenu -a
-	dh_installman -a
-#	dh_makeclilibs -a -V
-	dh_link -a
-	dh_strip -a
-	dh_compress -a -X.xpi
-	dh_fixperms -a
-	dh_clifixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_clideps -a -d -l debian/tmp/usr/lib/beagle
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+binary: binary-indep
 
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
+.PHONY: build clean binary-indep binary install configure patch unpatch

More information about the Pkg-cli-apps-commits mailing list