Hi,

Attached is the diff for my grunt 0.5.0-4.1 NMU.

-- 
·O·  Pierre Habouzit
··O                                                [EMAIL PROTECTED]
OOO                                                http://www.madism.org
diff -Nru /tmp/nyA5PhG6nJ/grunt-0.5.0/debian/changelog 
/tmp/u4d4kmsVOp/grunt-0.5.0/debian/changelog
--- /tmp/nyA5PhG6nJ/grunt-0.5.0/debian/changelog        2004-07-13 
17:44:51.000000000 +0200
+++ /tmp/u4d4kmsVOp/grunt-0.5.0/debian/changelog        2006-08-31 
15:22:16.000000000 +0200
@@ -1,3 +1,15 @@
+grunt (0.5.0-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update package to the last python policy (Closes: 380836).
+  * Put the lib in /usr/share/grunt, patch the binaries accordingly (appending
+    /usr/share/grunt to sys.path).
+  * Various fixes in debian/copyright.
+  * Bump Standards-Version to 3.7.2.
+  * Bump DH_COMPAT to 4.
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]>  Thu, 31 Aug 2006 15:13:34 +0200
+
 grunt (0.5.0-4) unstable; urgency=low
 
   * Fixed optik name (really).  Closes: #252990.
diff -Nru /tmp/nyA5PhG6nJ/grunt-0.5.0/debian/control 
/tmp/u4d4kmsVOp/grunt-0.5.0/debian/control
--- /tmp/nyA5PhG6nJ/grunt-0.5.0/debian/control  2004-07-13 17:43:25.000000000 
+0200
+++ /tmp/u4d4kmsVOp/grunt-0.5.0/debian/control  2006-08-31 15:23:43.000000000 
+0200
@@ -2,12 +2,12 @@
 Section: utils
 Priority: optional
 Maintainer: John Goerzen <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), python-dev (>= 2.3), python (>= 2.3)
-Standards-Version: 3.5.2
+Build-Depends: debhelper (>> 5.0.0), python-dev (>= 2.3), python-support (>= 
0.4)
+Standards-Version: 3.7.2
 
 Package: grunt
 Architecture: all
-Depends: python (>= 2.3), python-gnupginterface
+Depends: ${python:Depends}, python-gnupginterface
 Suggests: uucp, procmail | mailfilter
 Description: Secure remote execution via UUCP or e-mail using GPG
  GRUNT is a tool to let you execute commands remotely, offline.
diff -Nru /tmp/nyA5PhG6nJ/grunt-0.5.0/debian/copyright 
/tmp/u4d4kmsVOp/grunt-0.5.0/debian/copyright
--- /tmp/nyA5PhG6nJ/grunt-0.5.0/debian/copyright        2004-07-13 
17:41:27.000000000 +0200
+++ /tmp/u4d4kmsVOp/grunt-0.5.0/debian/copyright        2006-08-31 
15:20:50.000000000 +0200
@@ -1,7 +1,7 @@
 This package was debianized by John Goerzen <[EMAIL PROTECTED]> on
 Thu, 21 Nov 2002 10:29:19 -0600.
 
-Upstream Author(s): John Goerzen <[EMAIL PROTECTED]>
+Upstream Author: John Goerzen <[EMAIL PROTECTED]>
 
 Copyright:
 
@@ -20,7 +20,8 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
 
 Debian GNU/Linux users may find this license under
 /usr/share/common-licenses/GPL-2
diff -Nru /tmp/nyA5PhG6nJ/grunt-0.5.0/debian/dirs 
/tmp/u4d4kmsVOp/grunt-0.5.0/debian/dirs
--- /tmp/nyA5PhG6nJ/grunt-0.5.0/debian/dirs     2004-07-13 17:41:27.000000000 
+0200
+++ /tmp/u4d4kmsVOp/grunt-0.5.0/debian/dirs     2006-08-31 15:15:52.000000000 
+0200
@@ -1,3 +1,3 @@
 usr/bin
 usr/sbin
-usr/lib/site-python
+usr/share/grunt
diff -Nru /tmp/nyA5PhG6nJ/grunt-0.5.0/debian/pyversions 
/tmp/u4d4kmsVOp/grunt-0.5.0/debian/pyversions
--- /tmp/nyA5PhG6nJ/grunt-0.5.0/debian/pyversions       1970-01-01 
01:00:00.000000000 +0100
+++ /tmp/u4d4kmsVOp/grunt-0.5.0/debian/pyversions       2006-08-31 
15:22:48.000000000 +0200
@@ -0,0 +1 @@
+2.1-
diff -Nru /tmp/nyA5PhG6nJ/grunt-0.5.0/debian/rules 
/tmp/u4d4kmsVOp/grunt-0.5.0/debian/rules
--- /tmp/nyA5PhG6nJ/grunt-0.5.0/debian/rules    2004-07-13 17:41:27.000000000 
+0200
+++ /tmp/u4d4kmsVOp/grunt-0.5.0/debian/rules    2006-08-31 15:23:54.000000000 
+0200
@@ -6,7 +6,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=3
+export DH_COMPAT=4
 
 
 
@@ -55,7 +55,7 @@
        # Add here commands to install the package into debian/grunt.
        #$(MAKE) install DESTDIR=$(CURDIR)/debian/grunt
        cp gruntreceive gruntsend gruntrun debian/grunt/usr/bin
-       cp gruntlib.py debian/grunt/usr/lib/site-python
+       cp gruntlib.py debian/grunt/usr/share/grunt
        cp gruntreceive-uucp debian/grunt-uucp/usr/bin/gruntreceive-uucp
        chown root.uucp debian/grunt-uucp/usr/bin/gruntreceive-uucp
        chmod 4750 debian/grunt-uucp/usr/bin/gruntreceive-uucp
@@ -78,6 +78,7 @@
        dh_installinfo -a
 #      dh_undocumented
        dh_installchangelogs -a
+       dh_pysupport -a
        dh_link -a
        dh_strip -a
        dh_compress -a
@@ -107,6 +108,7 @@
        dh_installinfo -i
 #      dh_undocumented
        dh_installchangelogs -i
+       dh_pysupport -i
        dh_link -i
        dh_strip -i
        dh_compress -i
diff -Nru /tmp/nyA5PhG6nJ/grunt-0.5.0/gruntreceive 
/tmp/u4d4kmsVOp/grunt-0.5.0/gruntreceive
--- /tmp/nyA5PhG6nJ/grunt-0.5.0/gruntreceive    2004-07-13 17:44:03.000000000 
+0200
+++ /tmp/u4d4kmsVOp/grunt-0.5.0/gruntreceive    2006-08-31 15:16:43.000000000 
+0200
@@ -17,7 +17,9 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import sys, re, os, pwd, time, gruntlib, md5, fcntl
+import sys
+sys.path.append('/usr/share/grunt')
+import re, os, pwd, time, gruntlib, md5, fcntl
 from sys import stdin, stdout
 import GnuPGInterface
 
diff -Nru /tmp/nyA5PhG6nJ/grunt-0.5.0/gruntrun 
/tmp/u4d4kmsVOp/grunt-0.5.0/gruntrun
--- /tmp/nyA5PhG6nJ/grunt-0.5.0/gruntrun        2004-07-13 17:43:51.000000000 
+0200
+++ /tmp/u4d4kmsVOp/grunt-0.5.0/gruntrun        2006-08-31 15:16:55.000000000 
+0200
@@ -17,7 +17,9 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import sys, re, os, pwd, time, gruntlib
+import sys
+sys.path.append('/usr/share/grunt')
+import re, os, pwd, time, gruntlib
 from sys import stdin, stdout, argv
 import GnuPGInterface
 from optparse import OptionParser
diff -Nru /tmp/nyA5PhG6nJ/grunt-0.5.0/gruntsend 
/tmp/u4d4kmsVOp/grunt-0.5.0/gruntsend
--- /tmp/nyA5PhG6nJ/grunt-0.5.0/gruntsend       2004-07-13 17:43:56.000000000 
+0200
+++ /tmp/u4d4kmsVOp/grunt-0.5.0/gruntsend       2006-08-31 15:17:04.000000000 
+0200
@@ -17,7 +17,9 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import sys, re, os, pwd, time, gruntlib
+import sys
+sys.path.append('/usr/share/grunt')
+import re, os, pwd, time, gruntlib
 from sys import stdin, stdout, argv
 import GnuPGInterface
 from optparse import OptionParser

Attachment: signature.asc
Description: Digital signature

Reply via email to