[Python-ogre-commit] SF.net SVN: python-ogre:[829] trunk/python-ogre

[<mi...@us...>]

Revision: 829
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=829&view=rev
Author:   mithro
Date:     2008-12-08 08:36:02 +0000 (Mon, 08 Dec 2008)

Log Message:
-----------
Fix a bunch of deb building related problems.

Modified Paths:
--------------
    trunk/python-ogre/BuildModule.py
    trunk/python-ogre/boost/debian/control
    trunk/python-ogre/debian/changelog
    trunk/python-ogre/debian/rules
    trunk/python-ogre/debs/pygccxml-debian/rules

Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py	2008-12-05 07:54:34 UTC (rev 828)
+++ trunk/python-ogre/BuildModule.py	2008-12-08 08:36:02 UTC (rev 829)
@@ -198,7 +198,7 @@
     for file in os.listdir(debiandir):
         if not os.path.isfile(os.path.join(debiandir, file)):
             continue
-        ret = spawnTask( "sed --in-place "+os.path.join(debiandir,file)+" -e\"s|%%SHORTDATE%%|`date +%Y%m%d`|\" -e\"s|%%LONGDATE%%|`date +'%a, %d %b %Y %H:%m:%S %z'`|\" -e\"s|%%VERSION%%|"+module.source_version+"|\"", srcdir)
+        ret = spawnTask( "sed --in-place "+os.path.join(debiandir,file)+" -e\"s|%%SHORTDATE%%|`date +%Y%m%d`|g\" -e\"s|%%LONGDATE%%|`date +'%a, %d %b %Y %H:%m:%S %z'`|g\" -e\"s|%%VERSION%%|"+module.source_version+"|g\"", srcdir)
         if ret != 0:
             exit("Was not able to update the debian %s." % file)
 
@@ -246,7 +246,7 @@
     spawnTask("tar -zcvf %s.tar.gz %s" % (module.base, module.base), buildbase)
 
     # md5sum the package
-    spawnTask("md5sum %s.tar.gz | sed -e's/ .*//' > %s.md5sum" % (module.base, module.base), buildbase)
+    spawnTask("md5sum %s.tar.gz | sed -e's/ .*//g' > %s.md5sum" % (module.base, module.base), buildbase)
 
     debiandir = os.path.join(srcdir, "debian")
     if not os.path.exists(debiandir):
@@ -263,10 +263,10 @@
         if ret != 0:
             exit("Was not able to copy the debian %s." % file)
 
-        ret = spawnTask( "sed --in-place "+filepath+'                       ' + \
-                ' -e"s|%%SHORTDATE%%|`date +%Y%m%d`|"                       ' + \
-                ' -e"s|%%LONGDATE%%|`date +\'%a, %d %b %Y %H:%m:%S %z\'`|"  ' + \
-                ' -e"s|%%VERSION%%|'+module.source_version+'|"'
+        ret = spawnTask( "sed --in-place "+filepath+'                        ' + \
+                ' -e"s|%%SHORTDATE%%|`date +%Y%m%d`|g"                       ' + \
+                ' -e"s|%%LONGDATE%%|`date +\'%a, %d %b %Y %H:%m:%S %z\'`|g"  ' + \
+                ' -e"s|%%VERSION%%|'+module.source_version+'|g"'
             , srcdir)
         if ret != 0:
             exit("Was not able to update the debian %s." % file)
@@ -275,11 +275,11 @@
     dsc = os.path.join(buildbase, "%s.dsc" % module.base)
     spawnTask("cp -f %s %s" % (os.path.join(debiandir, "dsc"), dsc), os.getcwd())
     spawnTask( "sed --in-place "+dsc+ \
-        ' -e "s|%%MD5SUM%%|`cat '+module.base+'.md5sum`|"                         ' + \
-        ' -e "s|%%SIZE%%|`du -b '+module.base+'.tar.gz | sed -e\'s/[\t ]/ /g\'`|" ' + \
-        ' -e "s|%%SHORTDATE%%|`date +%Y%m%d`|"                                    ' + \
-        ' -e "s|%%LONGDATE%%|`date +\'%a, %d %b %Y %H:%m:%S %z\'`|"               ' + \
-        ' -e "s^%%BUILDDEPS%%^`cat '+os.path.join(debiandir, "control")+' | grep Build-Depends:`^"' + \
+        ' -e "s|%%MD5SUM%%|`cat '+module.base+'.md5sum`|g"                         ' + \
+        ' -e "s|%%SIZE%%|`du -b '+module.base+'.tar.gz | sed -e\'s/[\t ]/ /g\'`|g" ' + \
+        ' -e "s|%%SHORTDATE%%|`date +%Y%m%d`|g"                                    ' + \
+        ' -e "s|%%LONGDATE%%|`date +\'%a, %d %b %Y %H:%m:%S %z\'`|g"               ' + \
+        ' -e "s^%%BUILDDEPS%%^`cat '+os.path.join(debiandir, "control")+' | grep Build-Depends:`^g"' + \
         ' -e "s|%%VERSION%%|'+module.source_version+'|g"'
         , buildbase)
 

Modified: trunk/python-ogre/boost/debian/control
===================================================================
--- trunk/python-ogre/boost/debian/control	2008-12-05 07:54:34 UTC (rev 828)
+++ trunk/python-ogre/boost/debian/control	2008-12-08 08:36:02 UTC (rev 829)
@@ -1,7 +1,7 @@
 Source: boost-python%%VERSION%%-index
 Priority: extra
 Maintainer: Tim Ansell <mi...@mi...>
-Build-Depends: debhelper (>= 5), libboost-python-dev (>= %%VERSION%%), libstdc++6-4.1-dev | libstdc++6-4.2-dev, python-dev
+Build-Depends: debhelper (>= 5), libboost-python-dev (>= %%VERSION%%) | libboost-python%%VERSION%%-dev (>= %%VERSION%%), libstdc++6-4.1-dev | libstdc++6-4.2-dev, python-dev
 Standards-Version: 3.7.2
 Section: libs
 

Modified: trunk/python-ogre/debian/changelog
===================================================================
--- trunk/python-ogre/debian/changelog	2008-12-05 07:54:34 UTC (rev 828)
+++ trunk/python-ogre/debian/changelog	2008-12-08 08:36:02 UTC (rev 829)
@@ -1,3 +1,8 @@
+python-ogre (1.6.0-1) unstable; urgency=low
+
+  * Initial version of Python-Ogre 1.6.0
+
+ -- Tim 'Mithro' Ansell <mi...@mi...>  Mon, 08 Dec 2008 17:53:00 +1000
 python-ogre (0.0.0-7) unstable; urgency=low
 
   * Lots of small updates.

Modified: trunk/python-ogre/debian/rules
===================================================================
--- trunk/python-ogre/debian/rules	2008-12-05 07:54:34 UTC (rev 828)
+++ trunk/python-ogre/debian/rules	2008-12-08 08:36:02 UTC (rev 829)
@@ -23,17 +23,17 @@
 	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} cegui
 	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} ogre
 	# Extra modules
-	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} noise
+#	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} noise
 #	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} ogreode
-	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} betagui
-	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} cadunetree
+#	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} betagui
+#	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} cadunetree
 #	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} caelum
-	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} et
-	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} plib
-	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} ogreforests
-	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} ogreal
-	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} ogrevideoffmpeg
-	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} watermesh
+#	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} et
+#	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} plib
+#	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} ogreforests
+#	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} ogreal
+#	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} ogrevideoffmpeg
+#	LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} watermesh
 	touch $@
 
 build-python%:

Modified: trunk/python-ogre/debs/pygccxml-debian/rules
===================================================================
--- trunk/python-ogre/debs/pygccxml-debian/rules	2008-12-05 07:54:34 UTC (rev 828)
+++ trunk/python-ogre/debs/pygccxml-debian/rules	2008-12-08 08:36:02 UTC (rev 829)
@@ -34,6 +34,8 @@
 	dh_clean -k 
 	dh_installdirs
 	python$* setup.py install --root=$(CURDIR)/debian/pygccxml
+	find $(CURDIR)/debian/pygccxml -name msvc
+	find $(CURDIR)/debian/pygccxml -name msvc | xargs rm -rf
 
 # Build architecture-independent files here.
 binary-indep: build install


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.