[pkg-boost-commits] r14713 - boost/trunk/debian
Steven Michael Robbins
smr at alioth.debian.org
Thu Mar 29 02:32:10 UTC 2012
Author: smr
Date: 2012-03-29 02:32:09 +0000 (Thu, 29 Mar 2012)
New Revision: 14713
Removed:
boost/trunk/debian/create-boost-defaults-control.py
Modified:
boost/trunk/debian/changelog
boost/trunk/debian/control
boost/trunk/debian/update-control.py
Log:
Fix conflicts and the script to generate control.
Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog 2012-03-28 02:54:52 UTC (rev 14712)
+++ boost/trunk/debian/changelog 2012-03-29 02:32:09 UTC (rev 14713)
@@ -1,3 +1,10 @@
+boost1.49 (1.49.0-2) UNRELEASED; urgency=low
+
+ * control: Add missing -dev package Conflicts for: chrono, locale,
+ random, and timer.
+
+ -- Steve M. Robbins <smr at debian.org> Wed, 28 Mar 2012 21:30:08 -0500
+
boost1.49 (1.49.0-1) unstable; urgency=low
* New upstream.
Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control 2012-03-28 02:54:52 UTC (rev 14712)
+++ boost/trunk/debian/control 2012-03-29 02:32:09 UTC (rev 14713)
@@ -183,6 +183,7 @@
Depends: ${misc:Depends},
libboost1.49-dev (= ${binary:Version}),
libboost-chrono1.49.0 (= ${binary:Version})
+Conflicts: libboost-chrono1.48-dev
Description: C++ representation of time duration, time point, and clocks
This package forms part of the Boost C++ Libraries collection.
.
@@ -409,6 +410,7 @@
Depends: ${misc:Depends},
libboost1.49-dev (= ${binary:Version}),
libboost-locale1.49.0 (= ${binary:Version})
+Conflicts: libboost-locale1.48-dev
Description: C++ facilities for localization
This package forms part of the Boost C++ Libraries collection.
.
@@ -655,6 +657,7 @@
Depends: ${misc:Depends},
libboost1.49-dev (= ${binary:Version}),
libboost-random1.49.0 (= ${binary:Version})
+Conflicts: libboost-random1.42-dev, libboost-random1.46-dev, libboost-random1.48-dev
Description: Boost Random Number Library
This package forms part of the Boost C++ Libraries collection.
.
@@ -896,6 +899,7 @@
Depends: ${misc:Depends},
libboost1.49-dev (= ${binary:Version}),
libboost-timer1.49.0 (= ${binary:Version})
+Conflicts: libboost-timer1.42-dev, libboost-timer1.46-dev, libboost-timer1.48-dev
Description: C++ wall clock and CPU process timers
This package forms part of the Boost C++ Libraries collection.
.
Deleted: boost/trunk/debian/create-boost-defaults-control.py
===================================================================
--- boost/trunk/debian/create-boost-defaults-control.py 2012-03-28 02:54:52 UTC (rev 14712)
+++ boost/trunk/debian/create-boost-defaults-control.py 2012-03-29 02:32:09 UTC (rev 14713)
@@ -1,122 +0,0 @@
-#! /usr/bin/env python
-#
-# Script to create debian/control for package boost-defaults
-
-from deb822 import Deb822
-import re
-
-gBoostVersion = None
-
-
-class BoostVersion:
- def __init__(self, version):
- (self.Major,self.Minor,self.Revision) = version.split('.')
- self.PackageVersion = self.Major + '.' + self.Minor
- self.SharedObjectVersion = version
- def versionedSubPackage(self, subpkg):
- '''Given a subpackage name (subpkg) such as "dev",
- returns the versioned package name, libboost at Major.Minor@- at subpkg@.'''
- return 'libboost' + self.PackageVersion + '-' + subpkg
- def containsPackageVersion(self, string):
- '''Return true if 'string' contains the Package version string.'''
- return re.search(self.PackageVersion, string) is not None
- def containsSharedObjectVersion(self, string):
- '''Return true if 'string' contains the Shared Object version string.'''
- return re.search(self.SharedObjectVersion, string) is not None
- def stripVersion(self, string):
- '''Remove PackageVersion or SharedObjectVersion if contained in 'string'.'''
- return self.replaceVersion(string,'')
- def replaceVersion(self, string, replacement):
- '''Replace either PackageVersion or SharedObjectVersion if contained in 'string',
- with 'replacement'.'''
- string = re.sub(self.SharedObjectVersion, replacement, string)
- string = re.sub(self.PackageVersion, replacement, string)
- return string
-
-def appendFirstLine(string, suffix):
- '''Given a multiline string, return a new string
- with suffix appended to the first line.'''
- lines = string.split('\n')
- lines[0] += suffix
- return '\n'.join(lines)
-
-def deleteKey(paragraph, key):
- if paragraph.has_key(key):
- del paragraph[key]
-
-def processSourceParagraph(p):
- p['Source'] = 'boost-defaults'
- p['Build-Depends'] = 'debhelper (>= 8), ' + \
- gBoostVersion.versionedSubPackage('dev') + ' (>= ' + gBoostVersion.SharedObjectVersion + ')'
- deleteKey(p, 'Build-Conflicts')
- p['Vcs-Browser'] = 'http://svn.debian.org/wsvn/pkg-boost/boost-defaults/trunk/'
- p['Vcs-Svn'] = 'svn://svn.debian.org/svn/pkg-boost/boost-defaults/trunk'
-
-def genericPackageName(pkgName):
- '''Given an input package name of the form x1-x2-...-yVERSION-z,
- return an unversioned variant of form x1-x2-...-y-z.'''
- nameComponents = pkgName.split('-')
- lastComp = nameComponents[-1]
- if not lastComp in ['dbg','dev','doc']:
- return None
- return '-'.join(map(gBoostVersion.stripVersion, nameComponents))
-
-def dependsLibDev(p, versionedName):
- '''Set package Depends for a library -dev package.'''
- return '${misc:Depends}, ' + versionedName
-
-def dependsDbg(p, versionedName):
- '''Set package Depends for libboost-dbg.'''
- return 'libboost-dev (= ${binary:Version}), ' + dependsLibDev(p, versionedName)
-
-def dependsAllDev(p, versionedName):
- '''Set package Depends for libboost-all-dev.'''
- return gBoostVersion.stripVersion(p['Depends'])
-
-def processPackageParagraph(p):
- versionedName = p['Package']
- genericName = genericPackageName(versionedName)
- if genericName is None:
- return False
- p['Package'] = genericName
- if genericName == 'libboost-dbg':
- depends = dependsDbg(p, versionedName)
- elif genericName == 'libboost-all-dev':
- depends = dependsAllDev(p, versionedName)
- else:
- depends = dependsLibDev(p, versionedName)
- p['Depends'] = depends
- if genericName == 'libboost-dev':
- p['Suggests'] = 'libboost-doc'
- else:
- deleteKey(p, 'Suggests')
- deleteKey(p, 'Recommends')
- deleteKey(p, 'Conflicts')
- deleteKey(p, 'Replaces')
- p['Description'] = appendFirstLine(p['Description'], ' (default version)') \
- + '''
- .
- This package is a dependency package, which depends on Debian\'s default
- Boost version (currently ''' + gBoostVersion.PackageVersion + ').'
- return True
-
-def printParagraph(p):
- for key in p.keys():
- print "%s: %s" % (key, p[key])
-
-def processControl():
- firstParagraph = True
- for paragraph in Deb822.iter_paragraphs(open('control')):
- if firstParagraph:
- processSourceParagraph(paragraph)
- printParagraph(paragraph)
- firstParagraph = False
- else:
- if processPackageParagraph(paragraph):
- print
- printParagraph(paragraph)
-
-
-
-gBoostVersion = BoostVersion('1.48.0')
-processControl()
Modified: boost/trunk/debian/update-control.py
===================================================================
--- boost/trunk/debian/update-control.py 2012-03-28 02:54:52 UTC (rev 14712)
+++ boost/trunk/debian/update-control.py 2012-03-29 02:32:09 UTC (rev 14713)
@@ -48,6 +48,16 @@
nameRe = re.sub('\d', '\\d', paragraph['Package'])
return re.search(nameRe, paragraph['Conflicts']) is not None
+def updateConflicts(paragraph, oldPkgName):
+ newPkgName = paragraph['Package']
+ needsConflict = (newPkgName.endswith("-dev") and not newPkgName.endswith("-all-dev")) or conflictsWithPrevious(paragraph)
+ if not needsConflict: return
+ if paragraph.has_key('Conflicts'):
+ if paragraph['Conflicts'].find(oldPkgName) == -1:
+ paragraph['Conflicts'] += ', ' + oldPkgName
+ else:
+ paragraph['Conflicts'] = oldPkgName
+
def processSourceParagraph(p):
updateVersionedValue(p, 'Source')
@@ -56,8 +66,7 @@
updateVersionedValue(p, 'Depends')
updateVersionedValue(p, 'Recommends')
updateVersionedValue(p, 'Suggests')
- if conflictsWithPrevious(p):
- p['Conflicts'] += ', ' + oldPkgName
+ updateConflicts(p, oldPkgName)
def printParagraph(p):
for key in p.keys():
More information about the pkg-boost-commits
mailing list