[Pkg-ocaml-maint-commits] r6459 - in /trunk/tools/svn2git: functions.sh glondu_svn2git.py

[glondu at users.alioth.debian.org]

Author: glondu
Date: Tue May 18 15:03:51 2010
New Revision: 6459

URL: http://svn.debian.org/wsvn/?sc=1&rev=6459
Log:
Various updates, do not use deprecated stuff

Modified:
    trunk/tools/svn2git/functions.sh
    trunk/tools/svn2git/glondu_svn2git.py

Modified: trunk/tools/svn2git/functions.sh
URL: http://svn.debian.org/wsvn/trunk/tools/svn2git/functions.sh?rev=6459&op=diff
==============================================================================
--- trunk/tools/svn2git/functions.sh (original)
+++ trunk/tools/svn2git/functions.sh Tue May 18 15:03:51 2010
@@ -67,5 +67,5 @@
   git_check
   PKG=`basename "${PWD%/*}"`
   ( cd ../svn && gen_readme "$PKG" )
-  new-d-o-m-git-repo "$PKG"
+  dom-new-git-repo "$PKG"
 }

Modified: trunk/tools/svn2git/glondu_svn2git.py
URL: http://svn.debian.org/wsvn/trunk/tools/svn2git/glondu_svn2git.py?rev=6459&op=diff
==============================================================================
--- trunk/tools/svn2git/glondu_svn2git.py (original)
+++ trunk/tools/svn2git/glondu_svn2git.py Tue May 18 15:03:51 2010
@@ -10,7 +10,7 @@
 
 import sys, os, re
 from datetime import datetime, tzinfo, timedelta
-from debian_bundle.debian_support import version_compare
+from debian.debian_support import version_compare
 from tempfile import NamedTemporaryFile
 from commands import getoutput, getstatusoutput
 from xml.dom.minidom import parseString, parse
@@ -180,7 +180,7 @@
                     if tgz or not m:
                         print "# deal with (%s) %s manually" % (action, file)
                     else:
-                        print "git-import-orig --pristine-tar --no-dch ../svn/%s" % m.group(2)
+                        print "git-import-orig --pristine-tar ../svn/%s" % m.group(2)
                     nb_files -= 1
                     tgz.append(file)
         if working_dir:
@@ -249,7 +249,7 @@
                     # Repository not empty and still no upstream branch
                     run_command("git-branch", "git branch upstream")
                 print "New upstream tarball:", tgz
-                run_command("git-import-orig", "git-import-orig --pristine-tar --no-dch %s/%s" % (tarball_path, tgz))
+                run_command("git-import-orig", "git-import-orig --pristine-tar %s/%s" % (tarball_path, tgz))
                 self.svn2git.seen.add(tgz)
             elif len(n) > 1:
                 print "Too many new tarballs:", ", ".join(n)