[Pkg-mono-svn-commits] rev 2539 - in non-group/beagle/trunk/debian: . patches

Jose Carlos Garcia Sogo jsogo at costa.debian.org
Sat May 6 09:05:38 UTC 2006


Author: jsogo
Date: 2006-05-06 09:03:51 +0000 (Sat, 06 May 2006)
New Revision: 2539

Added:
   non-group/beagle/trunk/debian/patches/crawl-rules.dpatch
Modified:
   non-group/beagle/trunk/debian/NEWS.Debian
   non-group/beagle/trunk/debian/README.Debian
   non-group/beagle/trunk/debian/beagle.postrm
   non-group/beagle/trunk/debian/changelog
   non-group/beagle/trunk/debian/control
   non-group/beagle/trunk/debian/patches/00list
   non-group/beagle/trunk/debian/rules
Log:
Upload new upstream version (0.2.6-1)
 + add new patch to modify default crawl-rules
 + talk about this new system in README.Debian and NEWS.Debian
 + adjust dependencies, and clean a lot of lintian errors.
 + make beagle-backend-evolution depend on beagle. It is useless without it
 


Modified: non-group/beagle/trunk/debian/NEWS.Debian
===================================================================
--- non-group/beagle/trunk/debian/NEWS.Debian	2006-05-05 22:04:58 UTC (rev 2538)
+++ non-group/beagle/trunk/debian/NEWS.Debian	2006-05-06 09:03:51 UTC (rev 2539)
@@ -1,10 +1,11 @@
 
-  Evolution Data Backend
-  ----------------------
+  System wide indexing
+  --------------------
 
- Since version 0.1.2-3 of Beagle package, Evolution Data backend has been
- splitted in its own package: beagle-backend-evolution. You need to install
- it if you want Beagle to be able to index contacts and appointments from
- Evolution.
+  From this version, system wide indexing is enabled. By default documentation 
+  in /usr/share/doc, and /usr/gnome/help, as well as applications are going to
+  be indexed daily. What is going to be indexed is controlled by crawl-* files
+  in /etc/beagle directory.
 
--- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 26 Nov 2005 --
+
+-- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 06 May 2006 --

Modified: non-group/beagle/trunk/debian/README.Debian
===================================================================
--- non-group/beagle/trunk/debian/README.Debian	2006-05-05 22:04:58 UTC (rev 2538)
+++ non-group/beagle/trunk/debian/README.Debian	2006-05-06 09:03:51 UTC (rev 2539)
@@ -19,25 +19,38 @@
   2. Running
   ----------
   
- After this, you only have to run "beagled" in a terminal. If you want to 
- run it automatically when you log in your GNOME session, add it to 
- Start Programs in Session Manager.
+ After this, you only have to run "beagled" in a terminal.
+ If you are usign GNOME, you will have to go to Session Manager, in
+ Desktop->Preferences, and check if it is listed in start programs tab, and
+ if it is enabled (default: true).
+ 
+ Also, in KDE, you will have to go to session manager.
 
-  3. Searching
+  3. System Wide indexing
+  -----------------------
+
+ By default, beagle will index your system for apps and for documentation,
+ so they are also displayed in your searches, in a daily basis. To control
+ what is going to be indexed and how, please check crawl-* files in
+ /etc/beagle directory.
+
+ This process is run by a no-priviledges, system, beagleindex user.
+
+  4. Searching
   ------------
   
- For performing searches, you can use Best tool from Apps->Accesories menu.
+ For performing searches, you can use beagle-search tool from Apps->Accesories menu.
  If this is the first time you run beagle, you will need to wait a bit for the
  daemon to index data from different locations before you can get any result.
 
-  4. Evolution Data Backend
+  5. Evolution Data Backend
   -------------------------
 
  From beagle 0.1.2-3 version, Evolution Data backend has been split in its own
  package: beagle-backend-evolution. If you want to index calendar and contacts
  from Evolution, you will need to install it.
 
-  5. Storage of Cache Files
+  6. Storage of Cache Files
   -------------------------
 
  Beagle generates a bunch of cache files in which it stores different indexes. If
@@ -45,4 +58,7 @@
  the default, you will have to set BEAGLE_STORAGE variable to point to the
  desired place you want to store those files.
 
- -- Jose Carlos Garcia Sogo <jsogo at debian.org>, Sun, 19 Mar 2006 17:05:29 +0100
+ Also, if you are using system-wide crawl (default: yes), its indexes will be
+ created in /var/cache/beagle. 
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>, Sun, 06 May 2006 10:55:13 +0200

Modified: non-group/beagle/trunk/debian/beagle.postrm
===================================================================
--- non-group/beagle/trunk/debian/beagle.postrm	2006-05-05 22:04:58 UTC (rev 2538)
+++ non-group/beagle/trunk/debian/beagle.postrm	2006-05-06 09:03:51 UTC (rev 2539)
@@ -6,8 +6,8 @@
 case "$1" in 
    purge)
   
-   if getent passwd smokeping > /dev/null then \
-      deluser --system --remove-home beagleindex >/dev/null 1>&2 || true
+   if getent passwd smokeping > /dev/null; then \
+      deluser --system --remove-home beagleindex >/dev/null 1>&2 || true ;
    fi
 
    rm -rf /var/cache/beagle/indexes

Modified: non-group/beagle/trunk/debian/changelog
===================================================================
--- non-group/beagle/trunk/debian/changelog	2006-05-05 22:04:58 UTC (rev 2538)
+++ non-group/beagle/trunk/debian/changelog	2006-05-06 09:03:51 UTC (rev 2539)
@@ -1,4 +1,4 @@
-beagle (0.2.5-1) UNRELEASED; urgency=low
+beagle (0.2.6-1) unstable; urgency=low
 
   [ Jose Carlos Garcia Sogo ]
   * New upstream version.
@@ -15,10 +15,23 @@
 
   * Compile using python2.4 (Closes: #363929)
   * Move beagle-backend-evolution to Suggests in beagle package.
-  * debian/rules: set $sysconfdir to /etc (Closes: #363968)
+  * debian/rules:
+     + set $sysconfdir to /etc (Closes: #363968)
+     + remove .la file from beagle-dev.
+     + when using debhelper scripts in binary-indep or binary-arch targets,
+     they have to be called with -i or -a.
+     + make .exe binaries +x and make sure no other file (.dll, .mdb, ...) is.
   * debian/patches:
      + python2.4: new. Needed to compile python-beagle with python2.4
      + update relibtoolize.dpatch.
+     + crawl-rules: new; do not try to index a /windows partition, or anything
+     in /opt dir.
+  * debian/control:
+     + bumped standards version to 3.7.2. No changes needed.
+     + build depend on adduser.
+     + add a version to bash dependency.
+     + make beagle-backend-evolution depend on beagle binary package.
+  * README.Debian, NEWS.Debian: talk about new system wide crawl system.
 
   [ Brandon Hale ]
   * debian/control:
@@ -32,8 +45,9 @@
     + Build-Depend on cli-common-dev (>= 0.4.0)
     + Drop cli-common B-D
 
- -- Brandon Hale <brandon at ubuntu.com>  Tue,  2 May 2006 06:23:09 -0400
 
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sat,  6 May 2006 10:59:15 +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-05-05 22:04:58 UTC (rev 2538)
+++ non-group/beagle/trunk/debian/control	2006-05-06 09:03:51 UTC (rev 2539)
@@ -3,11 +3,11 @@
 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-dev (>= 0.4.0), dpatch, autotools-dev, python2.4-dev, python2.4-gtk2, python-gtk2-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libxss-dev
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: beagle
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libsqlite0, libmono0 (>= 1.0), bash
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libsqlite0, libmono0 (>= 1.0), bash (>= 3.0), adduser
 Recommends: poppler-utils
 Suggests: gnumeric, beagle-backend-evolution
 Description: indexing and search tool for your personal data
@@ -18,7 +18,7 @@
 
 Package: beagle-backend-evolution
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, beagle (= ${Source-Version})
 Description: evolution data backend for beagle
  Backend that allows Beagle indexing calendar and contact entries from 
  Evolution.

Modified: non-group/beagle/trunk/debian/patches/00list
===================================================================
--- non-group/beagle/trunk/debian/patches/00list	2006-05-05 22:04:58 UTC (rev 2538)
+++ non-group/beagle/trunk/debian/patches/00list	2006-05-06 09:03:51 UTC (rev 2539)
@@ -4,3 +4,4 @@
 usebash.dpatch
 use-python2.4.dpatch
 relibtoolize.dpatch
+crawl-rules.dpatch

Added: non-group/beagle/trunk/debian/patches/crawl-rules.dpatch
===================================================================
--- non-group/beagle/trunk/debian/patches/crawl-rules.dpatch	2006-05-05 22:04:58 UTC (rev 2538)
+++ non-group/beagle/trunk/debian/patches/crawl-rules.dpatch	2006-05-06 09:03:51 UTC (rev 2539)
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## crawl-rules.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-0.2.6~/debian/rules beagle-0.2.6/debian/rules
+--- beagle-0.2.6~/debian/rules	2006-05-06 10:16:12.000000000 +0200
++++ beagle-0.2.6/debian/rules	2006-05-06 10:36:55.000000000 +0200
+@@ -44,7 +44,7 @@
+ 	dh_testroot
+ 	rm -f build-stamp configure-stamp
+ 
+-	-$(MAKE) distclean
++	$(MAKE) clean
+ 	
+ 	rm -rf $(MONO_SHARED_DIR)/.wapi
+ 
+diff -urNad beagle-0.2.6~/tools/crawl-rules/crawl-documentation beagle-0.2.6/tools/crawl-rules/crawl-documentation
+--- beagle-0.2.6~/tools/crawl-rules/crawl-documentation	2006-04-29 18:08:24.000000000 +0200
++++ beagle-0.2.6/tools/crawl-rules/crawl-documentation	2006-05-06 10:38:28.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ CRAWL_INDEX_NAME="documentation"
+ 
+-CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /opt/kde3/share/doc /opt/gnome/share/gnome/help /usr/share/gnome/help"
++CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /usr/share/gnome/help"
+ 
+ CRAWL_ALLOW_PATTERNS="*.xml,*.html,*.docbook"
+ 
+diff -urNad beagle-0.2.6~/tools/crawl-rules/crawl-windows beagle-0.2.6/tools/crawl-rules/crawl-windows
+--- beagle-0.2.6~/tools/crawl-rules/crawl-windows	2005-07-15 21:58:42.000000000 +0200
++++ beagle-0.2.6/tools/crawl-rules/crawl-windows	2006-05-06 10:38:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-CRAWL_ENABLED="yes"
++CRAWL_ENABLED="no"
+ 
+ CRAWL_INDEX_NAME="windows"
+ 


Property changes on: non-group/beagle/trunk/debian/patches/crawl-rules.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: non-group/beagle/trunk/debian/rules
===================================================================
--- non-group/beagle/trunk/debian/rules	2006-05-05 22:04:58 UTC (rev 2538)
+++ non-group/beagle/trunk/debian/rules	2006-05-06 09:03:51 UTC (rev 2539)
@@ -44,7 +44,7 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	-$(MAKE) distclean
+	-$(MAKE) clean
 	
 	rm -rf $(MONO_SHARED_DIR)/.wapi
 
@@ -70,12 +70,16 @@
 
 
 	find debian/beagle debian/python-beagle -name '*.a' -delete
-	find debian/beagle debian/python-beagle -name '*.la' -delete
+	find debian/beagle debian/python-beagle debian/beagle-dev -name '*.la' -delete
 #	Don't remove .so links until we discover how to map to .so.0 files.
 #	find . -name '*.so' -exec rm -f {} \;
 	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
 
+#	Adjust permissions
+	find debian/ -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" -or -name "*.config" | xargs chmod -x
+	find debian/ -type f -name "*.exe" | xargs chmod +x
+
 install-indep:
 	dh_testdir
 	dh_testroot
@@ -88,40 +92,41 @@
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs ChangeLog
+	dh_installchangelogs -i ChangeLog
+	dh_installdocs -i
 #	dh_makeshlibs
-	dh_makeclilibs -m 1.0
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_clideps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+#	dh_makeclilibs -m 1.0 -i
+	dh_link -i
+	dh_strip -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_clideps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 	
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_installman
+	dh_installchangelogs -a ChangeLog
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installman -a
 	dh_makeshlibs -plibbeagle0 -V
 	dh_python -ppython-beagle
-	dh_makeclilibs -m 1.0
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_clideps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_makeclilibs -a -m 1.0
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_clideps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch




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