yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2746
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: yade
timestamp: Thu 2011-02-17 20:47:20 +0100
message:
  1. scripts/debian-prep does not insert now distribution name into the version number.
modified:
  scripts/debian-prep


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription

=== modified file 'scripts/debian-prep'
--- scripts/debian-prep	2011-02-08 07:37:09 +0000
+++ scripts/debian-prep	2011-02-17 19:47:20 +0000
@@ -3,7 +3,7 @@
 import sys,os.path,re,shutil,time
 DISTRIBUTION=sys.argv[1] if len(sys.argv)>1 else 'unstable'
 
-shutil.copytree('scripts/debian','./debian')
+
 if os.path.exists('RELEASE'):
 	VERSION=file('RELEASE').readline().strip()
 	UPDATE=(file('UPDATE').readline().strip() if os.path.exists('UPDATE') else '')
@@ -28,6 +28,16 @@
 open('VERSION','w').write(VERSION+'\n')
 _VERSION='-'+VERSION #used in templates
 
+
+# rename a current folder and create orig.tar.gz
+curName = os.path.basename(os.path.abspath(''))
+newName = 'yade-%s' % (VERSION)
+os.rename (('../'+curName), '../'+newName)
+shutil.rmtree('.bzr')
+os.system(('tar -czf ../yade-%s_%s.orig.tar.gz ../'+os.path.basename(os.path.abspath(''))+'/')%(VERSION,VERSION))
+shutil.copytree('scripts/debian','./debian')
+
+
 # control files
 def copyReplace(f1,f2):
 	"Copy file f1 to f2, evaluating all occurences of @...@ with eval(); they should expand to a string and can contain arbitrary python expressions."
@@ -51,23 +61,15 @@
 
 # package is yade-0.50, but with UPDATE .1, it is version 0.50.1
 
-# rename a current folder and create orig.tar.gz
-curName = os.path.basename(os.path.abspath(''))
-newName = 'yade-%s_%s1' % (VERSION,DISTRIBUTION)
-os.rename (('../'+curName), '../'+newName)
-shutil.rmtree('.bzr')
-os.system(('tar -czf ../yade-%s_%s1.orig.tar.gz ../'+os.path.basename(os.path.abspath(''))+'/')%(VERSION,DISTRIBUTION))
-
-
 # write debian/changelog
 try:
 	open('debian/changelog','w').write(
-	'''yade-%s (%s1) %s; urgency=low
+	'''yade-%s (%s-1) %s; urgency=low
 
   * Automatic debian changelog entry for yade-%s
 
  -- %s <%s>  %s
-'''%(VERSION,DISTRIBUTION,DISTRIBUTION,VERSION,os.environ['DEBFULLNAME'],os.environ['DEBEMAIL'],time.strftime("%a, %d %b %Y %H:%M:%S +0000",time.gmtime())))
+'''%(VERSION,VERSION,DISTRIBUTION,VERSION,os.environ['DEBFULLNAME'],os.environ['DEBEMAIL'],time.strftime("%a, %d %b %Y %H:%M:%S +0000",time.gmtime())))
 except KeyError:
 	print "Please, set DEBEMAIL and DEBFULLNAME as described here http://www.debian.org/doc/maint-guide/ch-first.en.html";