[Pkg-mono-svn-commits] rev 2459 - non-group/beagle/trunk/debian

Jose Carlos Garcia Sogo jsogo at costa.debian.org
Sat Apr 22 15:13:54 UTC 2006


Author: jsogo
Date: 2006-04-22 15:13:52 +0000 (Sat, 22 Apr 2006)
New Revision: 2459

Added:
   non-group/beagle/trunk/debian/beagle.postinst
   non-group/beagle/trunk/debian/beagle.postrm
   non-group/beagle/trunk/debian/beagled-kde.desktop
   non-group/beagle/trunk/debian/beagled.desktop
Modified:
   non-group/beagle/trunk/debian/beagle.dirs
   non-group/beagle/trunk/debian/beagle.install
   non-group/beagle/trunk/debian/changelog
   non-group/beagle/trunk/debian/control
   non-group/beagle/trunk/debian/python-beagle.install
   non-group/beagle/trunk/debian/rules
Log:
  * New beagle package (0.2.5-1)
    + Move beagle-crawl-system to a working place. Create dirs and user needed for this to work.
    + Compile with python2.4
    + Add autostart .desktop files for both GNOME and KDE.


Modified: non-group/beagle/trunk/debian/beagle.dirs
===================================================================
--- non-group/beagle/trunk/debian/beagle.dirs	2006-04-18 15:13:52 UTC (rev 2458)
+++ non-group/beagle/trunk/debian/beagle.dirs	2006-04-22 15:13:52 UTC (rev 2459)
@@ -1,5 +1,6 @@
 usr/bin
 usr/sbin
 usr/lib/beagle
-usr/share/doc/beagle/crawl-system
+etc/xdg/autostart
+usr/share/autostart
 usr/share/doc/beagle/mozilla-extension

Modified: non-group/beagle/trunk/debian/beagle.install
===================================================================
--- non-group/beagle/trunk/debian/beagle.install	2006-04-18 15:13:52 UTC (rev 2458)
+++ non-group/beagle/trunk/debian/beagle.install	2006-04-22 15:13:52 UTC (rev 2459)
@@ -2,5 +2,4 @@
 usr/bin
 usr/sbin
 usr/share
-usr/libexec
-usr/etc
+etc

Added: non-group/beagle/trunk/debian/beagle.postinst
===================================================================
--- non-group/beagle/trunk/debian/beagle.postinst	2006-04-18 15:13:52 UTC (rev 2458)
+++ non-group/beagle/trunk/debian/beagle.postinst	2006-04-22 15:13:52 UTC (rev 2459)
@@ -0,0 +1,29 @@
+#!/bin/sh
+# postinst file for beagle package.
+ 
+set -e
+
+case "$1" in 
+   configure)
+
+   getent passwd smokeping > /dev/null || \
+       adduser --system beagleindex --home /var/cache/beagle
+
+   mkdir -p /var/cache/beagle/indexes
+   chown beagleindex /var/cache/beagle/indexes/
+
+   ;;
+
+   abort-upgrade|abort-remove|abort-deconfigure)
+   ;;
+
+   *)
+   echo "postinst called with unknown argument \`$1'" >&2
+   exit 1
+   ;;
+
+esac
+
+#DEBHELPER#
+
+exit 0

Added: non-group/beagle/trunk/debian/beagle.postrm
===================================================================
--- non-group/beagle/trunk/debian/beagle.postrm	2006-04-18 15:13:52 UTC (rev 2458)
+++ non-group/beagle/trunk/debian/beagle.postrm	2006-04-22 15:13:52 UTC (rev 2459)
@@ -0,0 +1,27 @@
+#!/bin/sh
+# postrm file for beagle package.
+ 
+set -e
+
+case "$1" in 
+   purge)
+  
+   if getent passwd smokeping > /dev/null then \
+      deluser --system --remove-home beagleindex >/dev/null 1>&2 || true
+   fi
+
+   rm -rf /var/cache/beagle/indexes
+   ;;
+
+   remove)
+   # as these are index files generated from data in the computer, it doesn't
+   # has any sense to keep it once package has been removed.
+
+   rm -rf /var/cache/beagle/indexes/*
+   ;;
+
+esac
+
+#DEBHELPER#
+
+exit 0

Added: non-group/beagle/trunk/debian/beagled-kde.desktop
===================================================================
--- non-group/beagle/trunk/debian/beagled-kde.desktop	2006-04-18 15:13:52 UTC (rev 2458)
+++ non-group/beagle/trunk/debian/beagled-kde.desktop	2006-04-22 15:13:52 UTC (rev 2459)
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Beagle Search Tool
+Comment=Index files on your desktop
+Icon=system-search
+Exec=beagled
+Terminal=false
+Type=Application
+Categories=
+X-KDE-autostart-after=panel
+X-KDE-StartupNotify=false
+X-KDE-UniqueApplet=true
+NoDisplay=true 

Added: non-group/beagle/trunk/debian/beagled.desktop
===================================================================
--- non-group/beagle/trunk/debian/beagled.desktop	2006-04-18 15:13:52 UTC (rev 2458)
+++ non-group/beagle/trunk/debian/beagled.desktop	2006-04-22 15:13:52 UTC (rev 2459)
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Beagle Search Tool
+Comment=Index files on your desktop
+Icon=system-search
+Exec=beagled
+Terminal=false
+Type=Application
+Categories=
+OnlyShowIn=GNOME;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=beagle
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Autostart-enabled=true

Modified: non-group/beagle/trunk/debian/changelog
===================================================================
--- non-group/beagle/trunk/debian/changelog	2006-04-18 15:13:52 UTC (rev 2458)
+++ non-group/beagle/trunk/debian/changelog	2006-04-22 15:13:52 UTC (rev 2459)
@@ -1,3 +1,22 @@
+beagle (0.2.5-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+  * Merged back work made in Ubuntu by Brandon Hale and Sebastian Dröge:
+     + Make system wide application and documentation crawling work
+       - Stop moving beagle-crawl-system to /usr/share/doc
+       - Add unpriviledged beagleindex user
+       - Create /var/cache/beagle dir
+
+     + Install autostart .desktop files (Closes: #357756, #360668)
+       - beagled.desktop: New. Install at /etc/xdg/autostart
+       - beagle-kde.desktop: KDE needs a different one. Install it in
+       /usr/share/autostart
+
+  * Compile using python2.4 (Closes: #363929)
+  * Move beagle-backend-evolution to Suggests in beagle package. 
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sat, 22 Apr 2006 17:09:34 +0200
+
 beagle (0.2.4-1) unstable; urgency=low
 
   * New upstream version.

Modified: non-group/beagle/trunk/debian/control
===================================================================
--- non-group/beagle/trunk/debian/control	2006-04-18 15:13:52 UTC (rev 2458)
+++ non-group/beagle/trunk/debian/control	2006-04-22 15:13:52 UTC (rev 2459)
@@ -2,14 +2,14 @@
 Section: gnome
 Priority: optional
 Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Build-Depends: debhelper (>= 4.1.0), intltool, mono-mcs (>= 1.0) | c-sharp-compiler, libmono-dev (>= 1.0), libgnome2.0-cil, libgmime2.1-cil (>= 2.1.19), libevolution-cil, libgtk2.0-dev, libexif-dev, libsqlite0-dev, libxss-dev, zip, libgnomevfs2-dev (>= 2.6), libgnome2-dev (>= 2.6), libgalago-cil, cli-common (>= 0.2.0), dpatch, autotools-dev, python-dev, python-gtk2-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libxss-dev
+Build-Depends: debhelper (>= 4.1.0), intltool, mono-mcs (>= 1.0) | c-sharp-compiler, libmono-dev (>= 1.0), libgnome2.0-cil, libgmime2.1-cil (>= 2.1.19), libevolution-cil, libgtk2.0-dev, libexif-dev, libsqlite0-dev, libxss-dev, zip, libgnomevfs2-dev (>= 2.6), libgnome2-dev (>= 2.6), libgalago-cil, cli-common (>= 0.2.0), dpatch, autotools-dev, python2.4-dev, python2.4-gtk2-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libxss-dev
 Standards-Version: 3.6.2
 
 Package: beagle
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libsqlite0, libmono0 (>= 1.0), bash, gnome-icon-theme
-Recommends: beagle-backend-evolution, poppler-utils
-Suggests: gaim-xmms-remote
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libsqlite0, libmono0 (>= 1.0), bash
+Recommends: poppler-utils
+Suggests: gaim-xmms-remote, gnumeric, beagle-backend-evolution
 Description: indexing and search tool for your personal data
  A program for indexing and searching user's data. At the moment,
  it can index filesystems, GAIM logs, Evolution mail and data, RSS and other.
@@ -48,7 +48,7 @@
 
 Package: python-beagle
 Architecture: any
-Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python-gtk2
+Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python2.4-gtk2
 Description: python bindings for beagle
  Allow accessing Beagle daemon and peforming searches using Python.
  .

Modified: non-group/beagle/trunk/debian/python-beagle.install
===================================================================
--- non-group/beagle/trunk/debian/python-beagle.install	2006-04-18 15:13:52 UTC (rev 2458)
+++ non-group/beagle/trunk/debian/python-beagle.install	2006-04-22 15:13:52 UTC (rev 2459)
@@ -1 +1 @@
-usr/lib/python2.3
+usr/lib/python2.4

Modified: non-group/beagle/trunk/debian/rules
===================================================================
--- non-group/beagle/trunk/debian/rules	2006-04-18 15:13:52 UTC (rev 2458)
+++ non-group/beagle/trunk/debian/rules	2006-04-22 15:13:52 UTC (rev 2459)
@@ -41,6 +41,7 @@
 		       
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man \
+		--sysconfdir=/etc --localstatedir=/var \
 		--infodir=\$${prefix}/share/info --enable-libbeagle --enable-python --enable-webservices=no
 
 	touch configure-stamp
@@ -67,6 +68,7 @@
 	fi; )
 
 	rm -rf $(MONO_SHARED_DIR)/.wapi
+	rm -rf $(CURDIR)/beagle/etc/xdg
 
 	rm -rf debian/patched
 
@@ -81,9 +83,14 @@
 	dh_installdirs -a
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+	dh_install -a --sourcedir=debian/tmp
 	
-	dh_install -a --sourcedir=debian/tmp
+	# Install autostart desktop file for beagled
+	cp $(CURDIR)/debian/beagled.desktop $(CURDIR)/debian/beagle/etc/xdg/autostart
+	cp $(CURDIR)/debian/beagled-kde.desktop $(CURDIR)/debian/beagle/usr/share/autostart
 
+
 	find debian/beagle debian/python-beagle -name '*.a' -delete
 	find debian/beagle debian/python-beagle -name '*.la' -delete
 #	Don't remove .so links until we discover how to map to .so.0 files.
@@ -91,9 +98,6 @@
 	cp mozilla-extension/beagle.xpi $(CURDIR)/debian/beagle/usr/share/doc/beagle/mozilla-extension
 	cp mozilla-extension/README	$(CURDIR)/debian/beagle/usr/share/doc/beagle/mozilla-extension
 
-	mv debian/beagle/usr/libexec debian/beagle/usr/share/doc/beagle/crawl-system/bin
-	mv debian/beagle/usr/etc     debian/beagle/usr/share/doc/beagle/crawl-system
-
 install-indep:
 	dh_testdir
 	dh_testroot
@@ -108,7 +112,7 @@
 	dh_testroot
 	dh_installchangelogs ChangeLog
 #	dh_makeshlibs
-#	dh_makeclilibs -m 1.0
+	dh_makeclilibs -m 1.0
 	dh_link
 	dh_strip
 	dh_compress
@@ -129,7 +133,7 @@
 	dh_installman
 	dh_makeshlibs -plibbeagle0 -V
 	dh_python -ppython-beagle
-	dh_makeclilibs
+	dh_makeclilibs -m 1.0
 	dh_link
 	dh_strip
 	dh_compress




More information about the Pkg-mono-svn-commits mailing list