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

[Jose Carlos Garcia Sogo]

Author: jsogo
Date: 2006-05-20 13:40:43 +0000 (Sat, 20 May 2006)
New Revision: 2549

Added:
   non-group/beagle/trunk/debian/python2.4-beagle.dirs
   non-group/beagle/trunk/debian/python2.4-beagle.install
Removed:
   non-group/beagle/trunk/debian/python-beagle.dirs
   non-group/beagle/trunk/debian/python-beagle.install
Modified:
   non-group/beagle/trunk/debian/beagle.postinst
   non-group/beagle/trunk/debian/beagle.postrm
   non-group/beagle/trunk/debian/changelog
   non-group/beagle/trunk/debian/control
   non-group/beagle/trunk/debian/rules
Log:
New release:
 + Rename python-beagle to python2.4-beagle
 + Fix dependencies
 + postinst and postrm should not check for smokeping user, but beagleindex


Modified: non-group/beagle/trunk/debian/beagle.postinst
===================================================================
--- non-group/beagle/trunk/debian/beagle.postinst	2006-05-16 21:52:54 UTC (rev 2548)
+++ non-group/beagle/trunk/debian/beagle.postinst	2006-05-20 13:40:43 UTC (rev 2549)
@@ -6,7 +6,7 @@
 case "$1" in 
    configure)
 
-   getent passwd smokeping > /dev/null || \
+   getent passwd beagleindex > /dev/null || \
        adduser --system --home /var/cache/beagle beagleindex
 
    mkdir -p /var/cache/beagle/indexes

Modified: non-group/beagle/trunk/debian/beagle.postrm
===================================================================
--- non-group/beagle/trunk/debian/beagle.postrm	2006-05-16 21:52:54 UTC (rev 2548)
+++ non-group/beagle/trunk/debian/beagle.postrm	2006-05-20 13:40:43 UTC (rev 2549)
@@ -6,7 +6,7 @@
 case "$1" in 
    purge)
   
-   if getent passwd smokeping > /dev/null; then \
+   if getent passwd beagleindex > /dev/null; then \
       deluser --system --remove-home beagleindex >/dev/null 1>&2 || true ;
    fi
 

Modified: non-group/beagle/trunk/debian/changelog
===================================================================
--- non-group/beagle/trunk/debian/changelog	2006-05-16 21:52:54 UTC (rev 2548)
+++ non-group/beagle/trunk/debian/changelog	2006-05-20 13:40:43 UTC (rev 2549)
@@ -1,4 +1,4 @@
-beagle (0.2.6-2) UNRELEASED; urgency=low
+beagle (0.2.6-2) unstable; urgency=low
 
   * Version 0.2.6 fixes CVE-2006-1865. (Closes: #365371)
   * debian/control: build depend on missing libmono-sqlite2.0-cil.
@@ -7,8 +7,11 @@
     older adduser packages. (Closes: #366288)
   * Move beagle-dev to devel section, as well as libbeagle0 and python-beagle
     to libs section. (Closes: #367309)
+  * Change wrong postinst and postrm check for smokeping user. (Closes: #367948)
+  * Force dependency on python2.4, by renaming python-beagle to
+    python2.4-beagle, and thus following Debian's Python Policy (Closes: #366693)
 
- -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Tue, 16 May 2006 00:14:02 +0200
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sat, 20 May 2006 12:41:17 +0200
 
 beagle (0.2.6-1) unstable; urgency=low
 

Modified: non-group/beagle/trunk/debian/control
===================================================================
--- non-group/beagle/trunk/debian/control	2006-05-16 21:52:54 UTC (rev 2548)
+++ non-group/beagle/trunk/debian/control	2006-05-20 13:40:43 UTC (rev 2549)
@@ -48,10 +48,13 @@
  Beagle is 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.
 
-Package: python-beagle
+Package: python2.4-beagle
 Architecture: any
 Section: libs
 Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python2.4-gtk2
+Provides: python-beagle
+Conflicts: python-beagle
+Replaces: python-beagle
 Description: python bindings for beagle
  Allow accessing Beagle daemon and peforming searches using Python.
  .

Deleted: non-group/beagle/trunk/debian/python-beagle.dirs
===================================================================
--- non-group/beagle/trunk/debian/python-beagle.dirs	2006-05-16 21:52:54 UTC (rev 2548)
+++ non-group/beagle/trunk/debian/python-beagle.dirs	2006-05-20 13:40:43 UTC (rev 2549)
@@ -1 +0,0 @@
-usr/lib

Deleted: non-group/beagle/trunk/debian/python-beagle.install
===================================================================
--- non-group/beagle/trunk/debian/python-beagle.install	2006-05-16 21:52:54 UTC (rev 2548)
+++ non-group/beagle/trunk/debian/python-beagle.install	2006-05-20 13:40:43 UTC (rev 2549)
@@ -1 +0,0 @@
-usr/lib/python2.4

Copied: non-group/beagle/trunk/debian/python2.4-beagle.dirs (from rev 2547, non-group/beagle/trunk/debian/python-beagle.dirs)

Copied: non-group/beagle/trunk/debian/python2.4-beagle.install (from rev 2547, non-group/beagle/trunk/debian/python-beagle.install)

Modified: non-group/beagle/trunk/debian/rules
===================================================================
--- non-group/beagle/trunk/debian/rules	2006-05-16 21:52:54 UTC (rev 2548)
+++ non-group/beagle/trunk/debian/rules	2006-05-20 13:40:43 UTC (rev 2549)
@@ -69,8 +69,8 @@
 	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 debian/beagle-dev -name '*.la' -delete
+	find debian/beagle debian/python2.4-beagle -name '*.a' -delete
+	find debian/beagle debian/python2.4-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
@@ -115,15 +115,15 @@
 	dh_installexamples -a
 	dh_installman -a
 	dh_makeshlibs -plibbeagle0 -V
-	dh_python -ppython-beagle
-	dh_makeclilibs -a -m 1.0
+	dh_python -ppython2.4-beagle
+	dh_makeclilibs -a -V
 	dh_link -a
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a
-	dh_clideps -a
+	dh_clideps -a 
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a