Des indemnités en cas d'hospitalisation. Renseignez vous gratuitement

[PATCH] Add documentation for dpkg/version.h

Hi,

Attached is a proposed patch to add doxygen documentation for the
contents of dpkg/version.h.  I was not sure if you would have preferred
a bug for this or not, so here it is by mail.  The resulting doxygen
documentation can be seen at [1].

As an added bonus, there is also a typo fix for doc/coding-style.txt

~Niels

[1] http://people.debian.org/~nthykier/dpkg-doxygen/group__version.html

>From 2afb5a1114602601ea0d07b1208d21bbf2784018 Mon Sep 17 00:00:00 2001
From: Niels Thykier <niels <at> thykier.net>
Date: Thu, 24 May 2012 13:08:51 +0200
Subject: [PATCH 1/2] Fix two typoes in doc/coding-style.txt

Signed-off-by: Niels Thykier <niels <at> thykier.net>
---
 doc/coding-style.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/coding-style.txt b/doc/coding-style.txt
index dbeb2b7..06fb587 100644
--- a/doc/coding-style.txt
+++ b/doc/coding-style.txt
@@ -28,12 +28,12 @@ Code should generally strive for clarity. Monster functions should be split
 into logical and small pieces.

 Variable and function names should be generally descriptive, not needed
-for variables commonly used (for example and index inside a loop, etc),
+for variables commonly used (for example an index inside a loop, etc),
 acronyms should only be used if they are widely known externally or
 inside the project. The names should separate logical concepts within
 with underscores.

-On comments use UTF-8 characters for quotes, copyrigth symbols, etc.
+On comments use UTF-8 characters for quotes, copyright symbols, etc.

 On strings in code use simple or double quotes «''» «""». Not the unpaired
 ones «`'». Strings marked for translation, should only be fixed if there's
-- 
1.7.10

>From fe2590d7a230111acb4e77d30bc5e5a65161c0a1 Mon Sep 17 00:00:00 2001
From: Niels Thykier <niels <at> thykier.net>
Date: Thu, 24 May 2012 13:47:10 +0200
Subject: [PATCH 2/2] Add documentation for dpkg/version.h

Signed-off-by: Niels Thykier <niels <at> thykier.net>
---
 lib/dpkg/version.h |   73 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/lib/dpkg/version.h b/lib/dpkg/version.h
index ba59884..07b84c2 100644
--- a/lib/dpkg/version.h
+++ b/lib/dpkg/version.h
@@ -34,25 +34,98 @@ DPKG_BEGIN_DECLS
  * @{
  */

+/**
+ * Data structure representing a Debian version string.
+ *
+ * @see http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Version
+ */
 struct dpkg_version {
+	/**
+	 * The epoch.  It will be zero if no epoch is present.
+	 */
 	unsigned int epoch;
+	/**
+	 * The upstream part of the version.
+	 */
 	const char *version;
+	/**
+	 * The Debian revision part of the version.
+	 */
 	const char *revision;
 };

+/**
+ * Enum constants for the supported relation operations that can be done
+ * on Debian versions.
+ */
 enum dpkg_relation {
+	/**
+	 * The "none" relation, sentinel value.
+	 */
 	dpkg_relation_none	= 0,
+	/**
+	 * Equality relation ("=").
+	 */
 	dpkg_relation_eq	= DPKG_BIT(0),
+	/**
+	 * Less than relation ("<<").
+	 */
 	dpkg_relation_lt	= DPKG_BIT(1),
+	/**
+	 * Less than or equal to relation ("<=").
+	 */
 	dpkg_relation_le	= dpkg_relation_lt | dpkg_relation_eq,
+	/**
+	 * Greater than relation (">>").
+	 */
 	dpkg_relation_gt	= DPKG_BIT(2),
+	/**
+	 * Greater than or equal to relation (">=").
+	 */
 	dpkg_relation_ge	= dpkg_relation_gt | dpkg_relation_eq,
 };

+/**
+ * Turn the passed version into an empty version.  This can be used
+ * to ensure the version is properly initialized.
+ *
+ * @param version The version to clear.
+ */
 void dpkg_version_blank(struct dpkg_version *version);
+/**
+ * Test if a version is not empty.
+ *
+ * @param version The version to test.
+ * @retval true If the version is informative (i.e. not an empty version).
+ * @retval false If the version is empty.
+ */
 bool dpkg_version_is_informative(const struct dpkg_version *version);
+/**
+ * Compares two Debian versions according to the rules defined in the
+ * Debian Policy Manual.  This function follows the convention of
+ * comparator functions used by qsort().
+ *
+ * @param a The first version.
+ * @param b The second version.
+ * @retval 0 if a and b are equal.
+ * @retval <0 if a is smaller than b.
+ * @retval >0 if a is greater than b.
+ * @see http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Version
+ */
 int dpkg_version_compare(const struct dpkg_version *a,
                          const struct dpkg_version *b);
+/**
+ * Check if two versions have a certain relation.
+ *
+ * @param a The first version.
+ * @param rel The relation.
+ * @param b The second version.
+ * @retval true If the expression "a rel b" is true.
+ * @retval true If rel is #dpkg_relation_none
+ * @retval false Otherwise.
+ * @warning If rel is not a valid relation, this function will terminate
+ * the program.
+ */
 bool dpkg_version_relate(const struct dpkg_version *a,
                          enum dpkg_relation rel,
                          const struct dpkg_version *b);
--

-- 
1.7.10

Uw energiefaktuur

Ubuntu dpkg 1.16.1.2ubuntu8

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.

Format: 1.8
Date: Mon, 30 Apr 2012 12:49:51 +0100
Source: dpkg
Binary: libdpkg-dev dpkg dpkg-dev libdpkg-perl dselect
Architecture: source
Version: 1.16.1.2ubuntu8
Distribution: quantal
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss <at> lists.ubuntu.com>
Changed-By: Colin Watson <cjwatson <at> ubuntu.com>
Description: 
 dpkg       - Debian package management system
 dpkg-dev   - Debian package development tools
 dselect    - Debian package management front-end
 libdpkg-dev - Debian package management static library
 libdpkg-perl - Dpkg perl modules
Changes: 
 dpkg (1.16.1.2ubuntu8) quantal; urgency=low
 .
   * Revert hack to export compiler flags in dpkg-buildpackage.  Any package
     depending on this should be fixed to use dpkg-buildflags instead.
Checksums-Sha1: 
 792aa579fd92a7e85842ee02201860f73ee2dc42 2179 dpkg_1.16.1.2ubuntu8.dsc
 0aa9c59f717602c58a061af27ca2142264b64a60 5440283 dpkg_1.16.1.2ubuntu8.tar.bz2
Checksums-Sha256: 
 c5093a647c7379a811e6c72c8223f9774f77ef9f98b93c6c49a05d8c0a9d6024 2179 dpkg_1.16.1.2ubuntu8.dsc
 8a06cdb66047f3f220d195bc7f00f2d97e41a0026eefc324b9a68d2989c30d2e 5440283 dpkg_1.16.1.2ubuntu8.tar.bz2
Files: 
 9ed2fb2de1d6d30ec56fa51daf4e0c09 2179 admin required dpkg_1.16.1.2ubuntu8.dsc
 cf1e28469a2e90682eb88ece85a1b0a9 5440283 admin required dpkg_1.16.1.2ubuntu8.tar.bz2
Original-Maintainer: Dpkg Developers <debian-dpkg <at> lists.debian.org>

diff -pruN 1.16.1.2ubuntu7/debian/changelog 1.16.1.2ubuntu8/debian/changelog
--- 1.16.1.2ubuntu7/debian/changelog	2012-04-12 23:01:21.000000000 +0000
+++ 1.16.1.2ubuntu8/debian/changelog	2012-04-30 11:49:52.000000000 +0000
@@ -1,3 +1,10 @@
+dpkg (1.16.1.2ubuntu8) quantal; urgency=low
+
+  * Revert hack to export compiler flags in dpkg-buildpackage.  Any package
+    depending on this should be fixed to use dpkg-buildflags instead.
+
+ -- Colin Watson <cjwatson <at> ubuntu.com>  Mon, 30 Apr 2012 12:49:51 +0100
+
 dpkg (1.16.1.2ubuntu7) precise; urgency=low

   * Apply missing patch from upstream to let dselect's resolver deal
diff -pruN 1.16.1.2ubuntu7/scripts/dpkg-buildpackage.pl 1.16.1.2ubuntu8/scripts/dpkg-buildpackage.pl
--- 1.16.1.2ubuntu7/scripts/dpkg-buildpackage.pl	2011-11-01 18:13:15.000000000 +0000
+++ 1.16.1.2ubuntu8/scripts/dpkg-buildpackage.pl	2012-04-30 11:47:44.000000000 +0000
@@ -25,7 +25,6 @@ use POSIX;
 use Dpkg;
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
-use Dpkg::BuildFlags;
 use Dpkg::BuildOptions;
 use Dpkg::Compression;
 use Dpkg::Version;
@@ -294,36 +293,6 @@ if (defined $parallel) {
     $build_opts->export();
 }

-# Temporarily continue to export build flags to the environment.  This is to
-# avoid regressing various defaults in packages in the near term; we expect
-# to drop this after Ubuntu 12.04 LTS.
-# We don't do this if debhelper compat level >= 9 is in use, as a
-# lesser-evil workaround for an interaction with debhelper's build flags
-# handling.  See:
-#   https://lists.ubuntu.com/archives/ubuntu-devel/2011-November/034351.html
-my $debhelper_compat = 1;
-if (open my $debhelper_compat_file, 'debian/compat') {
-    my $line = <$debhelper_compat_file>;
-    close $debhelper_compat_file;
-    if (defined $line and length $line) {
-	$debhelper_compat = int($line);
-    }
-}
-if ($debhelper_compat < 9) {
-    my $build_flags = Dpkg::BuildFlags->new();
-    $build_flags->load_config();
-    foreach my $flag ($build_flags->list()) {
-	# While -Werror=format-security does catch many real bugs, it also
-	# causes many build failures and causes a number of configure tests
-	# to silently fail.  It was not exported to the environment in any
-	# released version of Ubuntu.
-	$build_flags->strip($flag, '-Werror=format-security', undef);
-	$ENV{$flag} = $build_flags->get($flag);
-	printf(_g("%s: export %s from dpkg-buildflags (origin: %s): %s\n"),
-	       $progname, $flag, $build_flags->get_origin($flag), $ENV{$flag});
-    }
-}
-
 my $cwd = cwd();
 my $dir = basename($cwd);

Ubuntu dpkg 1.16.1.2ubuntu7

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.

Format: 1.8
Date: Thu, 12 Apr 2012 16:59:09 -0600
Source: dpkg
Binary: libdpkg-dev dpkg dpkg-dev libdpkg-perl dselect
Architecture: source
Version: 1.16.1.2ubuntu7
Distribution: precise
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss <at> lists.ubuntu.com>
Changed-By: Adam Conrad <adconrad <at> ubuntu.com>
Description: 
 dpkg       - Debian package management system
 dpkg-dev   - Debian package development tools
 dselect    - Debian package management front-end
 libdpkg-dev - Debian package management static library
 libdpkg-perl - Dpkg perl modules
Launchpad-Bugs-Fixed: 853679
Changes: 
 dpkg (1.16.1.2ubuntu7) precise; urgency=low
 .
   * Apply missing patch from upstream to let dselect's resolver deal
     with multi-arch Provides in the same way as dpkg (LP: #853679)
Checksums-Sha1: 
 1c197174dd905d69c75a98b6396f82710e908731 1483 dpkg_1.16.1.2ubuntu7.dsc
 56baabca7580c652a4c0432f31bd4b4b642b48d1 5411935 dpkg_1.16.1.2ubuntu7.tar.bz2
Checksums-Sha256: 
 7c6c2be907be053e18e00c527f32c3dcb6ddaf65fefa3db013dd3b62ad23b7b8 1483 dpkg_1.16.1.2ubuntu7.dsc
 c35cede53650de9de8f9a9b68e7177fc2378708ae86367415ceb0ec69e7cc530 5411935 dpkg_1.16.1.2ubuntu7.tar.bz2
Files: 
 a16ad17f2236b3c9d11f059fb6b18ecd 1483 admin required dpkg_1.16.1.2ubuntu7.dsc
 b229195689a8046ba9a685ce32b540d5 5411935 admin required dpkg_1.16.1.2ubuntu7.tar.bz2
Original-Maintainer: Dpkg Developers <debian-dpkg <at> lists.debian.org>

diff -pruN 1.16.1.2ubuntu6/debian/changelog 1.16.1.2ubuntu7/debian/changelog
--- 1.16.1.2ubuntu6/debian/changelog	2012-04-08 22:22:32.000000000 +0000
+++ 1.16.1.2ubuntu7/debian/changelog	2012-04-12 23:01:21.000000000 +0000
@@ -1,3 +1,10 @@
+dpkg (1.16.1.2ubuntu7) precise; urgency=low
+
+  * Apply missing patch from upstream to let dselect's resolver deal
+    with multi-arch Provides in the same way as dpkg (LP: #853679)
+
+ -- Adam Conrad <adconrad <at> ubuntu.com>  Thu, 12 Apr 2012 16:59:09 -0600
+
 dpkg (1.16.1.2ubuntu6) precise; urgency=low

   * Build-depend on gettext:any for cross-building support.
diff -pruN 1.16.1.2ubuntu6/dselect/pkgdepcon.cc 1.16.1.2ubuntu7/dselect/pkgdepcon.cc
--- 1.16.1.2ubuntu6/dselect/pkgdepcon.cc	2011-03-01 11:30:50.000000000 +0000
+++ 1.16.1.2ubuntu7/dselect/pkgdepcon.cc	2012-04-12 22:58:44.000000000 +0000
@@ -412,6 +412,8 @@ packagelist::deppossatisfied(deppossi *p
        provider;
        provider = provider->rev_next) {
     if (provider->up->type == dep_provides &&
+        ((possi->up->type != dep_conflicts && possi->up->type != dep_breaks) ||
+         provider->up->up->set != possi->up->up->set) &&
         provider->up->up->clientdata &&
         !useavailable(provider->up->up) &&
         would_like_to_install(provider->up->up->clientdata->selected,
@@ -422,6 +424,8 @@ packagelist::deppossatisfied(deppossi *p
        provider;
        provider = provider->rev_next) {
     if (provider->up->type != dep_provides ||
+        ((possi->up->type == dep_conflicts || possi->up->type == dep_breaks) &&
+         provider->up->up->set == possi->up->up->set) ||
         !provider->up->up->clientdata ||
         !would_like_to_install(provider->up->up->clientdata->selected,
                                provider->up->up))

Finanziamenti per imprese e privati

Mails not getting through to debian-dpkg-cvs mailing list?

Hi!

It seems that since around 2012-04-18, there's been no more mails on
git pushes coming through to the debian-dpkg-cvs list. Maybe they got
stuck in some queue in alioth or lists.debian.org?

Checking now my logs it seems the time matches when lists switched
from liszt to bendel.

thanks,
guillem

Upcoming dpkg string changes

Hi!

As mentioned in the 1.16.3 upload mail, I've some pending changes
affecting original strings, and will be using the opportunity to do
some cleanups given that I'm touching them anyway. As such I'd
recommend holding off any translations for now, to avoid useless
work, also in case there's some later rectifications for example.
I'll send another mail once it seems safe to restart translation
work.

The things I've either pending locally or which I'll be working on in
the coming days are mostly --help output and error strings, for the
later I'll probably send a patch series to the list for review by
native speakers and translators.

I'm explicitly CCing Helge and Sven, because you are pretty reactive
to code changes, so to make sure you know what's going on.

thanks,
guillem

E' arrivato

dpkg 1.16.3 MIGRATED to testing

FYI: The status of the dpkg source package
in Debian's testing distribution has changed.

  Previous version: 1.16.2
  Current version:  1.16.3

--

-- 
This email is automatically generated once a day.  As the installation of
new packages into testing happens multiple times a day you will receive
later changes on the next day.
See http://release.debian.org/testing-watch/ for more information.

dpkg_1.16.3_amd64.changes ACCEPTED into unstable

Accepted:
dpkg-dev_1.16.3_all.deb
  to main/d/dpkg/dpkg-dev_1.16.3_all.deb
dpkg_1.16.3.dsc
  to main/d/dpkg/dpkg_1.16.3.dsc
dpkg_1.16.3.tar.bz2
  to main/d/dpkg/dpkg_1.16.3.tar.bz2
dpkg_1.16.3_amd64.deb
  to main/d/dpkg/dpkg_1.16.3_amd64.deb
dselect_1.16.3_amd64.deb
  to main/d/dpkg/dselect_1.16.3_amd64.deb
libdpkg-dev_1.16.3_amd64.deb
  to main/d/dpkg/libdpkg-dev_1.16.3_amd64.deb
libdpkg-perl_1.16.3_all.deb
  to main/d/dpkg/libdpkg-perl_1.16.3_all.deb

Changes:
dpkg (1.16.3) unstable; urgency=low
 .
  [ Guillem Jover ]
  * Do not look for newline beyond the read buffer on dpkg-deb extract.
  * Check update-alternative name and link arguments for all commands.
    Closes: #665050
  * Check all dpkg-divert filename arguments to be absolute and to not
    contain newlines. Closes: #21722
  * Print errors while reading the file list files on a new line instead
    of just after the progress percentage. Closes: #552517
  * Document in dpkg-source(1) that patches for source format “3.0 (quilt)”
    are expected to apply without any fuzz. Closes: #666752
    Based on a patch by Luca Capello <luca <at> pca.it>.
  * Remove redundant -Wformat-security from default dpkg-buildflags, which
    is already implied by -Werror=format-security. Closes: #664964
    Suggested by Peter Eisentraut <petere <at> debian.org>.
  * Document in dpkg-query(1) that commands producing multiple paragraphs
    will preserve the order of the packages specified on the argument list.
  * Change start-stop-daemon --exec on GNU/Hurd, FreeBSD, NetBSD, OpenBSD
    and Solaris to check for executables matching device and inode numbers
    instead of filenames.
  * Change start-stop-daemon --name on GNU/Hurd to check the process' argv[1]
    in addition to argv[0], to handle both binaries and interpreted scripts.
    Reported by Mats Erik Andersson <mats.andersson <at> gisladisker.se>.
  * Handle deb format versions as major.minor integers instead of strings or
    floats, the latter being susceptible to parsing errors depending on the
    current locale (although this was only affecting the old deb format).
  * Ignore the minor format version number for deb-split format, unifying
    the behaviour with the deb format.
  * Add support for an abitable containing arch attribute overrides.
  * Add x32 support to abitable, ostable and triplettable. Closes: #667037
  * Fix start-stop-daemon to work with relative --exec arguments and --chdir.
    Closes: #669047
  * Ignore request to rename a file owned by the diverting package on
    «dpkg-divert --add --rename». Closes: #588077
  * Clarify dpkg-gensymbols(1) by way of examples that architecture wildcards
    are supported in symbols files. Closes: #670048
  * Fix memory leak due to Dpkg::Control objects not being garbage-collected.
    Thanks to Ben Harris <bjh21 <at> cam.ac.uk>. Closes: #669012
  * Compute the md5sum hash on unpack for empty files too, so that these
    can be checked correctly for matching content when installing multiple
    package instances.
  * Generate md5sums files automatically at unpack time if missing from the
    binary package. Closes: #155676, #155799
  * Add missing list and md5sums database file checks to «dpkg --audit».
 .
  [ Helge Kreutzmann ]
  * Fix a typo in man/dpkg-buildflags.1.
 .
  [ Updated dpkg translations ]
  * French (Christian Perrier).
  * German (Sven Joachim).
  * Swedish (Peter Krefting).
 .
  [ Updated dselect translations ]
  * French (Christian Perrier).
  * German (Sven Joachim).
  * Swedish (Peter Krefting).
 .
  [ Updated scripts translations ]
  * French (Christian Perrier).
  * Swedish (Peter Krefting).
 .
  [ Updated scripts translations ]
  * French (Christian Perrier).
  * German (Helge Kreutzmann).
  * Swedish (Peter Krefting).

Override entries for your package:
dpkg-dev_1.16.3_all.deb - optional utils
dpkg_1.16.3.dsc - source admin
dpkg_1.16.3_amd64.deb - required admin
dselect_1.16.3_amd64.deb - optional admin
libdpkg-dev_1.16.3_amd64.deb - optional libdevel
libdpkg-perl_1.16.3_all.deb - optional perl

Announcing to debian-devel-changes <at> lists.debian.org
Closing bugs: 155676 155799 21722 552517 588077 664964 665050 666752 667037 669012 669047 670048 

Thank you for your contribution to Debian.

--

-- 
To UNSUBSCRIBE, email to debian-dpkg-REQUEST <at> lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster <at> lists.debian.org
Archive: http://lists.debian.org/E1SNgqA-0002Pb-DP <at> franck.debian.org