Commit Graph

63 Commits

Author SHA1 Message Date
Ben Hutchings 06c36b3662 debian/control: Move many build dependencies to Build-Depends-Arch field 2017-09-30 14:09:54 +01:00
Ben Hutchings 619cd907a8 debian/lib/python/debian_linux/debian.py: Handle packages with only short descriptions 2016-07-14 11:41:47 +01:00
Ben Hutchings d25555f798 debian_linux.debian: Add urgency attribute to Changelog.Entry objects 2016-05-06 21:33:06 +01:00
Ben Hutchings db948006fc debian.py: Really implement stable order of fields not in the predefined order 2016-01-08 12:15:30 +00:00
Ben Hutchings dc3b21cc1a debian.py: Implement stable order of fields in debian/tests/control
Move the field ordering control from the Package class to a new
superclass of Package and TestsControl.
2016-01-08 12:08:28 +00:00
Ben Hutchings 3d3a4891f7 debian/lib/python: Add support for package relation restrictions 2015-11-10 13:34:39 +00:00
Ben Hutchings f87229e26d debian/lib/python: Never merge package relations with a different version operator
This doesn't currently make any difference, but it's obviously wrong
to ignore the operator.
2015-11-10 13:34:00 +00:00
Ben Hutchings 5c869ad70b debian_linux.{debian,utils}: Support templates for debian/tests/control 2015-10-31 22:04:13 +00:00
Ben Hutchings 0b7b6d7a62 debian/control: Make field ordering consistent again
This regressed when switching to Python 3 and not consistently
replacing use of iter*() methods.
2015-10-31 22:04:13 +00:00
Ben Hutchings 6b977589fb debian/bin,debian/control,debian/lib/python: Use Python 3 2015-08-29 21:48:39 +01:00
Ben Hutchings d0824f1862 Add security update versions to regex and distribution/version sanity checks
Currently we don't allow versions like 3.16.7-ckt9-3~deb8u1~bpo7+1 in
*-backports, but we should!  Add the security suffix as an option
before the backports suffix.

We also don't check that an upload to *-security or *-lts includes the
expected suffix and nothing else.  Add a check for that.

svn path=/dists/trunk/linux/; revision=22539
2015-04-27 19:44:59 +00:00
Ben Hutchings e16e503620 Fix regex for the bpo version suffix
The Debian release is now identified by only the major version so
there need not be 2 digits directly after ~bpo.  Eventually the
major version will grow to 2 digits itself, so allow 1 or more
digits after the ~bpo.

svn path=/dists/trunk/linux/; revision=22538
2015-04-27 19:33:39 +00:00
Ben Hutchings 86a13b0457 Add support for -ckt stable updates
svn path=/dists/sid/linux/; revision=22057
2014-11-08 15:41:20 +00:00
Ben Hutchings 6ceeb0fb7b Revert "Make version in package name independant of internal abi"
Unfortunately it is not sufficient to provide virtual packages
that exactly match the ABI name.  For example, 'reportbug kernel'
doesn't find the virtual package, and neither do dpkg commands
such as 'dpkg -l linux-image-$(uname -r)'.

svn path=/dists/sid/linux/; revision=22034
2014-11-04 04:47:19 +00:00
Bastian Blank cb080a3167 Make version in package name independant of internal abi
* debian/bin/gencontrol.py: Export internal ABI.
* debian/lib/python/debian_linux/debian.py: Export three-part version.
* debian/rules.real
  - Provide more variables.
  - Make udeb generation easier.
  - Use internal ABI for files.
* debian/templates/control.*: Provide name with internal ABI.
* debian/templates/image.plain.*: Use internal ABI.

svn path=/dists/sid/linux/; revision=22017
2014-11-01 19:20:16 +00:00
Bastian Blank b142d22431 debian/lib/python/debian_linux: More Python 3 support.
svn path=/dists/trunk/linux/; revision=20954
2014-01-02 22:18:35 +00:00
Bastian Blank 929894f687 * debian/bin/genorig.py, debian/lib/python/debian_linux/abi.py,
debian/lib/python/debian_linux/debian.py,
  debian/lib/python/debian_linux/patches.py,
  - Support Python 3.
  - Use six if necessary.
* debian/templates/control.main.in, debian/templates/control.source.in:
  Depend on python-six.

svn path=/dists/trunk/linux/; revision=20946
2014-01-01 22:14:11 +00:00
Ben Hutchings 005ac51bc5 Merge changes from wheezy-backports to reduce the need for source changes
- Add a suite/version sanity-check for backports
- Disable building of udebs whenever package version indicates backports

svn path=/dists/trunk/linux/; revision=20483
2013-08-11 21:30:14 +00:00
Ben Hutchings 4207b3a025 Change experimental Debian revision format to 1~exp<n>
This is a more commonly used format, and frees up some space in
utsname::version.

svn path=/dists/trunk/linux/; revision=20181
2013-06-02 20:54:29 +00:00
Ben Hutchings 66aee7e881 Add __str__ method to debian_linux.debian.Version
Python 2.x does not use the __unicode__ method to implement str() or
string formatting with %s.  Add a __str__ method as a wrapper.

svn path=/dists/trunk/linux/; revision=20180
2013-06-02 20:51:26 +00:00
Ben Hutchings a0f3681215 Fix linux_upstream_full compute for version with modifier
From: Julien Danjou <julien@danjou.info>

If you try to use genorig on a version with a modifier (like ~rc1), it will
fail because self.linux_upstream_full will be equal to the short version
rather than version-modifier.

svn path=/dists/trunk/linux/; revision=19308
2012-08-04 13:44:08 +00:00
Ben Hutchings 7b1b408f6d Fix version parsing in debian/bin/genorig.py when using a DFSG number
svn path=/dists/sid/linux-2.6/; revision=19055
2012-06-02 20:17:17 +00:00
Bastian Blank 00b9cab893 * debian/lib/python/debian_linux/debian.py: Use unicode.
* debian/lib/python/debian_linux/gencontrol.py: Remove debugging code.

svn path=/dists/trunk/linux-2.6/; revision=18495
2012-01-11 20:01:55 +00:00
Bastian Blank 141957a25b debian/lib/python: Use unicode always.
svn path=/dists/trunk/linux-2.6/; revision=18493
2012-01-11 18:03:27 +00:00
Bastian Blank dad674e6e7 * debian/lib/python/debian_linux/debian.py:
Replace PackageFieldList with PackageArchitecture.
* debian/bin/gencontrol.py,
  debian/lib/python/debian_linux/gencontrol.py: Adopt changes.

svn path=/dists/trunk/linux-2.6/; revision=18492
2012-01-11 17:46:47 +00:00
Bastian Blank e962c1ae2b debian/lib/python: Remove SortedDict, use collections.OrderedDict instead.
svn path=/dists/trunk/linux-2.6/; revision=18491
2012-01-11 17:16:00 +00:00
Bastian Blank 9863acaddd debian/lib/python: PEP8 and other style fixes.
svn path=/dists/trunk/linux-2.6/; revision=18488
2012-01-11 16:52:29 +00:00
Bastian Blank 8537a6b1a0 debian/lib/python/debian_linux/debian.py: Accept shorter versions.
svn path=/dists/trunk/linux-2.6/; revision=18191
2011-10-28 18:47:00 +00:00
Ben Hutchings c5c0944e33 Restore the third version component
UTS_RELEASE and all the file names still use "3.0.0", which means the
installation commands using a version truncated to two components
fail.  And if we truncate UTS_RELEASE this will break many userland
tools, starting with depmod (!).

svn path=/dists/trunk/linux-2.6/; revision=17556
2011-06-01 05:41:03 +00:00
Ben Hutchings 1b919cfb84 Prepare gencontrol and templates for Linux 3.0
- Remove all relations based on the 'major' template variable
- Define 'source_package' template variable and use it in place
  of 'linux-@major@' in linux-patch-debian-<version> description
- Expect only 2 upstream version components if first component is
  not '2'
- Remove the 'major' template variable and 'MAJOR' make variable

svn path=/dists/trunk/linux-2.6/; revision=17482
2011-05-30 18:54:31 +00:00
Bastian Blank 7f5e7db196 Merge /dists/squeeze/linux-2.6 (2.6.32-30).
svn path=/dists/trunk/linux-2.6/; revision=16903
2011-02-16 17:06:01 +00:00
Bastian Blank f39af9bc20 debian/lib/python/debian_linux/debian.py: Accept NMU version.
svn path=/dists/trunk/linux-2.6/; revision=14673
2009-11-24 18:35:28 +00:00
Bastian Blank efe8b3659e debian/lib/python/debian_linux/debian.py: Check some version tags.
svn path=/dists/trunk/linux-2.6/; revision=14671
2009-11-24 18:30:25 +00:00
Bastian Blank aaa9f09b7b debian/lib/python/debian_linux/debian.py:
Make it possible to override the arches of all relations.

svn path=/dists/trunk/linux-2.6/; revision=14229
2009-09-14 09:42:44 +00:00
Bastian Blank 3320c09c45 debian/lib/python/debian_linux/debian.py: Style fixes.
svn path=/dists/trunk/linux-2.6/; revision=14228
2009-09-14 09:27:02 +00:00
Bastian Blank a6e1800783 debian/lib/python/debian_linux/debian.py
- Make short description also a list.
- Support extend of description with another description.

svn path=/dists/trunk/linux-2.6/; revision=11702
2008-06-25 12:54:20 +00:00
Bastian Blank c2c2ce206e debian/lib/python/debian_linux/debian.py:
Make description output method easier.

svn path=/dists/trunk/linux-2.6/; revision=11701
2008-06-25 12:34:38 +00:00
Maximilian Attems f7c50a1460 Revert "debian/bin, debian/lib: Infrastructure was declared irrelevant, drop it."
as announced revert trunk sabotage

This reverts commit ccf3463f401b082e89a76d3475eff5b30c05622a.

svn path=/dists/trunk/linux-2.6/; revision=11215
2008-05-01 07:54:28 +00:00
Bastian Blank fb5a6dc08c debian/bin, debian/lib: Infrastructure was declared irrelevant, drop it.
svn path=/dists/trunk/linux-2.6/; revision=11213
2008-04-27 06:26:15 +00:00
Bastian Blank 3787190a1e debian/lib/python/debian_linux/debian.py: Rename debian member to revision.
svn path=/dists/trunk/linux-2.6/; revision=11100
2008-04-19 11:22:11 +00:00
Bastian Blank 696ff417a3 * debian/bin/genorig.py: Apply debian patch.
* debian/lib/python/debian_linux/debian.py: Export dfsg version.
* debian/lib/python/debian_linux/patches.py: Add.
* debian/patches/debian/dfsg/drivers-media-video-dabus.patch,
  debian/patches/debian/dfsg/drivers-net-dgrs.patch,
  debian/patches/debian/dfsg/drivers-net-tokenring-3c359-smctr.patch: Fix.
* debian/patches/series/orig-0: Move from debian/patches/series/orig-1.

svn path=/dists/trunk/linux-2.6/; revision=9504
2007-09-12 12:27:17 +00:00
Bastian Blank dcf93c8534 debian/lib/python/debian_linux/debian.py: Make Version object modifiable.
svn path=/dists/trunk/linux-2.6/; revision=9054
2007-07-04 09:35:49 +00:00
Bastian Blank 852b4e2bca debian/bin/gencontrol.py, debian/lib/python/debian_linux/debian.py:
Remove unused code.

svn path=/dists/trunk/linux-2.6/; revision=8983
2007-06-17 10:56:55 +00:00
Bastian Blank 0d6e4097bc debian/bin/gencontrol.py, debian/lib/python/debian_linux: Cleanup.
svn path=/dists/trunk/linux-2.6/; revision=8982
2007-06-17 10:51:18 +00:00
Bastian Blank bb11d12939 debian/bin/gencontrol.py, debian/lib/python/debian_linux: Coding style cleanup.
svn path=/dists/trunk/linux-2.6/; revision=8981
2007-06-17 10:34:22 +00:00
dann frazier 54cff8dab6 * Allow '.' and '+' in the target dist field of the changelog. dpkg has
supported this since 1.13.20, see #361171.

svn path=/dists/trunk/linux-2.6/; revision=8418
2007-04-03 21:16:22 +00:00
Bastian Blank d04348aed9 debian/lib/python/debian_linux/debian.py: Remove old code.
svn path=/dists/trunk/linux-2.6/; revision=8260
2007-02-03 15:18:07 +00:00
Bastian Blank 6a1db40587 debian/lib/python/debian_linux/debian.py: Remove duplicated code.
svn path=/dists/trunk/linux-2.6/; revision=8235
2007-01-27 21:35:28 +00:00
Bastian Blank 60506c6fef debian/bin/gencontrol.py, debian/lib/python/debian_linux/debian.py:
Make changelog code object oriented.

svn path=/dists/trunk/linux-2.6/; revision=8234
2007-01-27 21:20:16 +00:00
Bastian Blank 5be1182aea debian/lib/python/debian_linux/debian.py: Update.
svn path=/dists/trunk/linux-2.6/; revision=8233
2007-01-27 21:01:14 +00:00