[Usbmount-commit] r39 - tags/usbmount tags/usbmount/0.0.15 tags/usbmount/0.0.15/debian trunk/usbmount trunk/usbmount/debian

rbrito-guest at alioth.debian.org rbrito-guest at alioth.debian.org
Sun Oct 19 08:20:41 UTC 2008 

Author: rbrito-guest
Date: 2008-10-19 08:20:40 +0000 (Sun, 19 Oct 2008)
New Revision: 39

Added:
   tags/usbmount/0.0.15/
Modified:
   tags/usbmount/0.0.15/debian/changelog
   tags/usbmount/0.0.15/debian/control
   tags/usbmount/0.0.15/debian/copyright
   tags/usbmount/0.0.15/usbmount
   tags/usbmount/0.0.15/usbmount.conf
   trunk/usbmount/debian/changelog
   trunk/usbmount/debian/compat
   trunk/usbmount/debian/control
   trunk/usbmount/debian/copyright
   trunk/usbmount/usbmount
   trunk/usbmount/usbmount.conf
Log:
Included tag for version 0.0.15 and modified trunk for 0.0.15.1


Copied: tags/usbmount/0.0.15 (from rev 38, trunk/usbmount)


Property changes on: tags/usbmount/0.0.15
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: tags/usbmount/0.0.15/debian/changelog
===================================================================
--- trunk/usbmount/debian/changelog	2007-02-23 16:19:16 UTC (rev 38)
+++ tags/usbmount/0.0.15/debian/changelog	2008-10-19 08:20:40 UTC (rev 39)
@@ -1,12 +1,14 @@
 usbmount (0.0.15) unstable; urgency=low
 
-  * New Maintainer, thanks to Martin Dickopp for all his work (Closes: #408621)
-  * Added XS-Vcs-Svn and XS-Vcs-Browser entries
-  * Ident homepage with two spaces
-  * Recreate /var/run/usbmount if it has been deleted (Closes: #345364)
-  * Add Option to disable usbmount (Closes: #380809)
+  * New maintainer (Closes: #408621).
+  * debian/control: updated with my e-mail address.
+  * debian/control: add Homepage field. (removed lintian warning)
+  * debian/control: included DM-Upload-Allowed field. I am a DM now.
+  * debian/control: upgraded Standards-Version to 3.8.0. (lintian warning).
+  * debian/copyright: made machine-parseable format. (removed lintian warning)
+  * More changes to come...
 
- -- Armin Berres <trigger+debian at space-based.de>  Fri, 23 Feb 2007 17:12:29 +0100
+ -- Rogério Brito <rbrito at ime.usp.br>  Fri, 26 Sep 2008 15:58:33 -0300
 
 usbmount (0.0.14.1) unstable; urgency=low
 

Modified: tags/usbmount/0.0.15/debian/control
===================================================================
--- trunk/usbmount/debian/control	2007-02-23 16:19:16 UTC (rev 38)
+++ tags/usbmount/0.0.15/debian/control	2008-10-19 08:20:40 UTC (rev 39)
@@ -1,16 +1,14 @@
 Source: usbmount
 Section: admin
 Priority: extra
-Maintainer: Armin Berres <trigger+debian at space-based.de>
-Uploaders: Alexander Schnehl <tolimar at debian.org>
+Maintainer: Rogério Brito <rbrito at ime.usp.br>
 Build-Depends: cdbs, debhelper (>= 4.1.0)
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/usbmount/trunk/usbmount
-XS-Vcs-Browser: http://svn.debian.org/wsvn/usbmount
+Standards-Version: 3.8.0
+Homepage: http://usbmount.alioth.debian.org/
 
 Package: usbmount
 Architecture: all
-Depends: udev (>= 0.084-2), lockfile-progs
+Depends: udev, lockfile-progs
 Description: automatically mount and unmount USB mass storage devices
  This package automatically mounts USB mass storage devices (typically
  USB pens) when they are plugged in, and unmounts them when they are
@@ -28,5 +26,3 @@
  a desktop environment. Users which would like an icon to appear when an
  USB device is plugged in should use the pmount and hal packages
  instead.
- .
-  Homepage: http://usbmount.alioth.debian.org/

Modified: tags/usbmount/0.0.15/debian/copyright
===================================================================
--- trunk/usbmount/debian/copyright	2007-02-23 16:19:16 UTC (rev 38)
+++ tags/usbmount/0.0.15/debian/copyright	2008-10-19 08:20:40 UTC (rev 39)
@@ -1,8 +1,25 @@
-This package was written and debianized by Martin Dickopp
-<martin at zero-based.org> on Tue, 26 Oct 2004 17:02:18 +0200.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Author: Martin Dickopp <martin at zero-based.org>
+Upstream-Name: usbmount
+Upstream-Maintainer: Rogério Brito <rbrito at ime.usp.br>
+Upstream-Source: http://usbmount.alioth.debian.org/
+Download: svn://svn.debian.org/svn/usbmount/trunk/usbmount
 
-Copyright:
+Files: *
+Copyright: © 2004, 2005, 2006, 2007 Martin Dickopp <martin at zero-based.org>
+License: BSD-2
+  This package is free software; the copyright holder gives unlimited
+  permission to copy and/or distribute it, with or without
+  modifications, as long as this notice is preserved.
 
+  This package is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+  even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  PARTICULAR PURPOSE.
+
+Files: debian/*
+Copyright: © 2004, 2005, 2006, 2007 Martin Dickopp <martin at zero-based.org>
+License: BSD-2
   This package is free software; the copyright holder gives unlimited
   permission to copy and/or distribute it, with or without
   modifications, as long as this notice is preserved.
@@ -11,3 +28,15 @@
   but WITHOUT ANY WARRANTY, to the extent permitted by law; without
   even the implied warranty of MERCHANTABILITY or FITNESS FOR A
   PARTICULAR PURPOSE.
+
+Files: debian/*
+Copyright: © 2008 Rogério Brito <rbrito at ime.usp.br>
+License: BSD-2
+  This package is free software; the copyright holder gives unlimited
+  permission to copy and/or distribute it, with or without
+  modifications, as long as this notice is preserved.
+
+  This package is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+  even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  PARTICULAR PURPOSE.

Modified: tags/usbmount/0.0.15/usbmount
===================================================================
--- trunk/usbmount/usbmount	2007-02-23 16:19:16 UTC (rev 38)
+++ tags/usbmount/0.0.15/usbmount	2008-10-19 08:20:40 UTC (rev 39)
@@ -40,7 +40,6 @@
 test -x /lib/udev/vol_id || { log err "cannnot execute /lib/udev/vol_id"; exit 1; }
 
 # Default values for configuration variables.
-ENABLED=1
 MOUNTPOINTS=""
 FILESYSTEMS=""
 MOUNTOPTIONS=""
@@ -52,14 +51,7 @@
     . /etc/usbmount/usbmount.conf
 fi
 
-if [ "$ENABLED" = "0" ]; then
-    log info "usbmount is disabled, see /etc/usbmount/usbmount.conf"
-    exit 0
-fi
 
-# Recreate /var/run/usbmount/ if it has been deleted
-test -e /var/run/usbmount/ || mkdir /var/run/usbmount/
-
 umask 022
 
 if test "$1" = add; then

Modified: tags/usbmount/0.0.15/usbmount.conf
===================================================================
--- trunk/usbmount/usbmount.conf	2007-02-23 16:19:16 UTC (rev 38)
+++ tags/usbmount/0.0.15/usbmount.conf	2008-10-19 08:20:40 UTC (rev 39)
@@ -2,9 +2,6 @@
 # storage devices when they are plugged in and unmounts them when they
 # are removed.
 
-# Change to zero to disable usbmount
-ENABLED=1
-
 # Mountpoints: These directories are eligible as mointpoints for USB
 # mass storage devices.  A newly plugged in device is mounted on the
 # first directory in this list that exists and on which nothing is

Modified: trunk/usbmount/debian/changelog
===================================================================
--- trunk/usbmount/debian/changelog	2007-02-23 16:19:16 UTC (rev 38)
+++ trunk/usbmount/debian/changelog	2008-10-19 08:20:40 UTC (rev 39)
@@ -1,12 +1,24 @@
+usbmount (0.0.15.1) unstable; urgency=low
+
+  * debian/control: actually include the DM-Upload-Allowed field.
+  * debian/compat: upgraded it to 5, since even stable has it.
+  * debian/control: updated build-dependency on debhelper >= 5.
+  * debian/control: eliminated the versioned dependency on udev,
+    since stable has it for a long time.
+
+ -- Rogério Brito <rbrito at ime.usp.br>  Tue, 30 Sep 2008 11:04:19 -0300
+
 usbmount (0.0.15) unstable; urgency=low
 
-  * New Maintainer, thanks to Martin Dickopp for all his work (Closes: #408621)
-  * Added XS-Vcs-Svn and XS-Vcs-Browser entries
-  * Ident homepage with two spaces
-  * Recreate /var/run/usbmount if it has been deleted (Closes: #345364)
-  * Add Option to disable usbmount (Closes: #380809)
+  * New maintainer (Closes: #408621).
+  * debian/control: updated with my e-mail address.
+  * debian/control: add Homepage field. (removed lintian warning)
+  * debian/control: included DM-Upload-Allowed field. I am a DM now.
+  * debian/control: upgraded Standards-Version to 3.8.0. (lintian warning).
+  * debian/copyright: made machine-parseable format. (removed lintian warning)
+  * More changes to come...
 
- -- Armin Berres <trigger+debian at space-based.de>  Fri, 23 Feb 2007 17:12:29 +0100
+ -- Rogério Brito <rbrito at ime.usp.br>  Fri, 26 Sep 2008 15:58:33 -0300
 
 usbmount (0.0.14.1) unstable; urgency=low
 

Modified: trunk/usbmount/debian/compat
===================================================================
--- trunk/usbmount/debian/compat	2007-02-23 16:19:16 UTC (rev 38)
+++ trunk/usbmount/debian/compat	2008-10-19 08:20:40 UTC (rev 39)
@@ -1 +1 @@
-4
+5

Modified: trunk/usbmount/debian/control
===================================================================
--- trunk/usbmount/debian/control	2007-02-23 16:19:16 UTC (rev 38)
+++ trunk/usbmount/debian/control	2008-10-19 08:20:40 UTC (rev 39)
@@ -1,16 +1,15 @@
 Source: usbmount
 Section: admin
 Priority: extra
-Maintainer: Armin Berres <trigger+debian at space-based.de>
-Uploaders: Alexander Schnehl <tolimar at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.0)
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/usbmount/trunk/usbmount
-XS-Vcs-Browser: http://svn.debian.org/wsvn/usbmount
+Maintainer: Rogério Brito <rbrito at ime.usp.br>
+Build-Depends: cdbs, debhelper (>= 5)
+DM-Upload-Allowed: yes
+Standards-Version: 3.8.0
+Homepage: http://usbmount.alioth.debian.org/
 
 Package: usbmount
 Architecture: all
-Depends: udev (>= 0.084-2), lockfile-progs
+Depends: udev, lockfile-progs
 Description: automatically mount and unmount USB mass storage devices
  This package automatically mounts USB mass storage devices (typically
  USB pens) when they are plugged in, and unmounts them when they are
@@ -28,5 +27,3 @@
  a desktop environment. Users which would like an icon to appear when an
  USB device is plugged in should use the pmount and hal packages
  instead.
- .
-  Homepage: http://usbmount.alioth.debian.org/

Modified: trunk/usbmount/debian/copyright
===================================================================
--- trunk/usbmount/debian/copyright	2007-02-23 16:19:16 UTC (rev 38)
+++ trunk/usbmount/debian/copyright	2008-10-19 08:20:40 UTC (rev 39)
@@ -1,8 +1,25 @@
-This package was written and debianized by Martin Dickopp
-<martin at zero-based.org> on Tue, 26 Oct 2004 17:02:18 +0200.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Author: Martin Dickopp <martin at zero-based.org>
+Upstream-Name: usbmount
+Upstream-Maintainer: Rogério Brito <rbrito at ime.usp.br>
+Upstream-Source: http://usbmount.alioth.debian.org/
+Download: svn://svn.debian.org/svn/usbmount/trunk/usbmount
 
-Copyright:
+Files: *
+Copyright: © 2004, 2005, 2006, 2007 Martin Dickopp <martin at zero-based.org>
+License: BSD-2
+  This package is free software; the copyright holder gives unlimited
+  permission to copy and/or distribute it, with or without
+  modifications, as long as this notice is preserved.
 
+  This package is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+  even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  PARTICULAR PURPOSE.
+
+Files: debian/*
+Copyright: © 2004, 2005, 2006, 2007 Martin Dickopp <martin at zero-based.org>
+License: BSD-2
   This package is free software; the copyright holder gives unlimited
   permission to copy and/or distribute it, with or without
   modifications, as long as this notice is preserved.
@@ -11,3 +28,15 @@
   but WITHOUT ANY WARRANTY, to the extent permitted by law; without
   even the implied warranty of MERCHANTABILITY or FITNESS FOR A
   PARTICULAR PURPOSE.
+
+Files: debian/*
+Copyright: © 2008 Rogério Brito <rbrito at ime.usp.br>
+License: BSD-2
+  This package is free software; the copyright holder gives unlimited
+  permission to copy and/or distribute it, with or without
+  modifications, as long as this notice is preserved.
+
+  This package is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+  even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  PARTICULAR PURPOSE.

Modified: trunk/usbmount/usbmount
===================================================================
--- trunk/usbmount/usbmount	2007-02-23 16:19:16 UTC (rev 38)
+++ trunk/usbmount/usbmount	2008-10-19 08:20:40 UTC (rev 39)
@@ -40,7 +40,6 @@
 test -x /lib/udev/vol_id || { log err "cannnot execute /lib/udev/vol_id"; exit 1; }
 
 # Default values for configuration variables.
-ENABLED=1
 MOUNTPOINTS=""
 FILESYSTEMS=""
 MOUNTOPTIONS=""
@@ -52,14 +51,7 @@
     . /etc/usbmount/usbmount.conf
 fi
 
-if [ "$ENABLED" = "0" ]; then
-    log info "usbmount is disabled, see /etc/usbmount/usbmount.conf"
-    exit 0
-fi
 
-# Recreate /var/run/usbmount/ if it has been deleted
-test -e /var/run/usbmount/ || mkdir /var/run/usbmount/
-
 umask 022
 
 if test "$1" = add; then

Modified: trunk/usbmount/usbmount.conf
===================================================================
--- trunk/usbmount/usbmount.conf	2007-02-23 16:19:16 UTC (rev 38)
+++ trunk/usbmount/usbmount.conf	2008-10-19 08:20:40 UTC (rev 39)
@@ -2,9 +2,6 @@
 # storage devices when they are plugged in and unmounts them when they
 # are removed.
 
-# Change to zero to disable usbmount
-ENABLED=1
-
 # Mountpoints: These directories are eligible as mointpoints for USB
 # mass storage devices.  A newly plugged in device is mounted on the
 # first directory in this list that exists and on which nothing is

More information about the Usbmount-commit mailing list