please unblock reprepro 4.2.0-2
* Adam D. Barratt <adam@adam-barratt.org.uk> [101023 19:58]:
> On Sat, 2010-10-23 at 16:21 +0200, Bernhard R. Link wrote:
> > - make it compile with gcc-4.5 (#600982)
> > by simple including a header more.
> > (gcc-4.5 is not in squeeze, but I guess it would still nice to
> > have things in a release buildable with current tools).
> > - fix an error that reprepro errors out hard claiming out of memory
> > when a package has a special override but no normal ones.
> > - adapt an example in the documentation to current dpkg-source
> > - add support for "ButAutomaticUpgrades" (compare #600358)
> > (that is actually a feature addition, but should have not impact
> > on other stuff).
>
> Only the second and third fixes really fit the current criteria for
> updates, but having reviewed the diff I'd be okay with accepting the
> other two.
>
> One quick comment:
>
> ++(The value is handled as arbitrary string,
>
> s/as/& an/
>
> ++though anything but \fByes\fP does make much
> ++sense right now.)
>
> and I guess there's a "not" missing here.
I've added the following patch (this is documentation update to allowed,
isn't it) and uploaded to unstable:
|From 6fb57dc033bb873d13e3827c9fcb20aca6ca5cec Mon Sep 17 00:00:00 2001
|From: Bernhard R. Link <brlink@debian.org>
|Date: Sun, 24 Oct 2010 08:58:11 +0000
|Subject: fix typos in manpage
|
|---
| docs/reprepro.1 | 8 ++++----
| 1 files changed, 4 insertions(+), 4 deletions(-)
|
|diff --git a/docs/reprepro.1 b/docs/reprepro.1
|index ffa2d1f..e993ed8 100644
|--- a/docs/reprepro.1
|+++ b/docs/reprepro.1
|@@ -1083,15 +1083,15 @@ Release files.
| .B NotAutomatic
| This optional field is simply copied into the
| Release files.
|-(The value is handled as arbitrary string,
|-though anything but \fByes\fP does make much
|+(The value is handled as an arbitrary string,
|+though anything but \fByes\fP does not make much
| sense right now.)
| .TP
| .B ButAutomaticUpgrades
| This optional field is simply copied into the
| Release files.
|-(The value is handled as arbitrary string,
|-though anything but \fByes\fP does make much
|+(The value is handled as an arbitrary string,
|+though anything but \fByes\fP does not make much
| sense right now.)
| .TP
| .B Description
|--
|1.5.6.5
Attached the diff of the unpacked sources and of the .deb files
for reference. (source diff is the same as before with the patch added).
Bernhard R. Link
diff -ruN reprepro-4.2.0-1/binaries.c reprepro-4.2.0-2/binaries.c
--- reprepro-4.2.0-1/binaries.c 2010-07-11 12:15:57.000000000 +0200
+++ reprepro-4.2.0-2/binaries.c 2010-10-24 11:27:35.000000000 +0200
@@ -280,7 +280,7 @@
return RET_NOTHING;
r = override_allreplacefields(o, &fields);
- if( RET_WAS_ERROR(r) )
+ if( !RET_IS_OK(r) )
return r;
newchunk = chunk_replacefields(controlchunk, fields, "Filename", false);
addfield_free(fields);
diff -ruN reprepro-4.2.0-1/debian/changelog reprepro-4.2.0-2/debian/changelog
--- reprepro-4.2.0-1/debian/changelog 2010-07-11 12:24:26.000000000 +0200
+++ reprepro-4.2.0-2/debian/changelog 2010-10-24 11:14:27.000000000 +0200
@@ -1,3 +1,13 @@
+reprepro (4.2.0-2) unstable; urgency=low
+
+ * include sys/stat.h in filecntl.h (Closes: 600982)
+ * Don't get confused with packages only having special override
+ entries
+ * adopt changelogs.example to new dpkg-source
+ * add support for ButAutomaticUpgrades (Closes: 600358)
+
+ -- Bernhard R. Link <brlink@debian.org> Fri, 22 Oct 2010 16:54:03 +0200
+
reprepro (4.2.0-1) unstable; urgency=low
* Fix Berkley -> Berkeley (Closes: 586899)
diff -ruN reprepro-4.2.0-1/debian/patches/0001-include-sys-stat-in-filecntl.c.patch reprepro-4.2.0-2/debian/patches/0001-include-sys-stat-in-filecntl.c.patch
--- reprepro-4.2.0-1/debian/patches/0001-include-sys-stat-in-filecntl.c.patch 1970-01-01 01:00:00.000000000 +0100
+++ reprepro-4.2.0-2/debian/patches/0001-include-sys-stat-in-filecntl.c.patch 2010-10-24 11:14:27.000000000 +0200
@@ -0,0 +1,24 @@
+From 19e449dc03710c09c6d5571e15a3c78f029bb7ff Mon Sep 17 00:00:00 2001
+From: Bernhard R. Link <brlink@debian.org>
+Date: Thu, 12 Aug 2010 14:15:42 +0000
+Subject: include sys/stat in filecntl.c
+
+---
+ filecntl.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/filecntl.c b/filecntl.c
+index 1da25f5..903349c 100644
+--- a/filecntl.c
++++ b/filecntl.c
+@@ -12,6 +12,7 @@
+ #include <stdbool.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <errno.h>
+--
+1.5.6.5
+
diff -ruN reprepro-4.2.0-1/debian/patches/0002-Fix-error-in-reoverride-with-packages-that-have-a.patch reprepro-4.2.0-2/debian/patches/0002-Fix-error-in-reoverride-with-packages-that-have-a.patch
--- reprepro-4.2.0-1/debian/patches/0002-Fix-error-in-reoverride-with-packages-that-have-a.patch 1970-01-01 01:00:00.000000000 +0100
+++ reprepro-4.2.0-2/debian/patches/0002-Fix-error-in-reoverride-with-packages-that-have-a.patch 2010-10-24 11:14:27.000000000 +0200
@@ -0,0 +1,53 @@
+From ccafd1d03403fc068a3e3abc60998fd5480866b1 Mon Sep 17 00:00:00 2001
+From: Bernhard R. Link <brlink@debian.org>
+Date: Thu, 9 Sep 2010 16:48:46 +0000
+Subject: Fix error in reoverride with packages that have a "$Component" override but no other overrides. (reprepro erroneously thinks it is running out of memory in that case).
+
+---
+ binaries.c | 2 +-
+ override.c | 2 ++
+ sources.c | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/binaries.c b/binaries.c
+index e9e72bd..31e3228 100644
+--- a/binaries.c
++++ b/binaries.c
+@@ -280,7 +280,7 @@ retvalue binaries_doreoverride(const struct target *target, const char *packagen
+ return RET_NOTHING;
+
+ r = override_allreplacefields(o, &fields);
+- if( RET_WAS_ERROR(r) )
++ if( !RET_IS_OK(r) )
+ return r;
+ newchunk = chunk_replacefields(controlchunk, fields, "Filename", false);
+ addfield_free(fields);
+diff --git a/override.c b/override.c
+index ba70b3d..9ef52f2 100644
+--- a/override.c
++++ b/override.c
+@@ -382,6 +382,8 @@ retvalue override_allreplacefields(const struct overridedata *override, struct f
+ return RET_ERROR_OOM;
+ }
+ }
++ if( fields == NULL )
++ return RET_NOTHING;
+ *fields_p = fields;
+ return RET_OK;
+ }
+diff --git a/sources.c b/sources.c
+index 8be47d0..c3944b1 100644
+--- a/sources.c
++++ b/sources.c
+@@ -336,7 +336,7 @@ retvalue sources_doreoverride(const struct target *target, const char *packagena
+ return RET_NOTHING;
+
+ r = override_allreplacefields(o, &fields);
+- if( RET_WAS_ERROR(r) )
++ if( !RET_IS_OK(r) )
+ return r;
+ newchunk = chunk_replacefields(controlchunk, fields,
+ "Directory", true);
+--
+1.5.6.5
+
diff -ruN reprepro-4.2.0-1/debian/patches/0003-replace-sn-with-no-copy-in-changelogs.example.patch reprepro-4.2.0-2/debian/patches/0003-replace-sn-with-no-copy-in-changelogs.example.patch
--- reprepro-4.2.0-1/debian/patches/0003-replace-sn-with-no-copy-in-changelogs.example.patch 1970-01-01 01:00:00.000000000 +0100
+++ reprepro-4.2.0-2/debian/patches/0003-replace-sn-with-no-copy-in-changelogs.example.patch 2010-10-24 11:14:27.000000000 +0200
@@ -0,0 +1,25 @@
+From eff9641b21cd035660d4f23b0f7ede82c7960240 Mon Sep 17 00:00:00 2001
+From: Bernhard R. Link <brlink@debian.org>
+Date: Thu, 14 Oct 2010 08:38:07 +0000
+Subject: replace -sn with --no-copy in changelogs.example
+
+---
+ docs/changelogs.example | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/docs/changelogs.example b/docs/changelogs.example
+index 2ff7229..1a133af 100755
+--- a/docs/changelogs.example
++++ b/docs/changelogs.example
+@@ -51,7 +51,7 @@ addsource() {
+ echo "extract $CANONDSCFILE information to $TARGETDIR"
+ mkdir -p -- "$TARGETDIR"
+ EXTRACTDIR="$(mktemp -d)"
+- (cd -- "$EXTRACTDIR" && dpkg-source -sn -x "$CANONDSCFILE" > /dev/null)
++ (cd -- "$EXTRACTDIR" && dpkg-source --no-copy -x "$CANONDSCFILE" > /dev/null)
+ install -D -- "$EXTRACTDIR"/*/debian/copyright "$TARGETDIR/copyright"
+ install -D -- "$EXTRACTDIR"/*/debian/changelog "$TARGETDIR/changelog"
+ chmod -R u+rwX -- "$EXTRACTDIR"
+--
+1.5.6.5
+
diff -ruN reprepro-4.2.0-1/debian/patches/0004-add-support-for-ButAutomaticUpgrades-thanks-to-Mode.patch reprepro-4.2.0-2/debian/patches/0004-add-support-for-ButAutomaticUpgrades-thanks-to-Mode.patch
--- reprepro-4.2.0-1/debian/patches/0004-add-support-for-ButAutomaticUpgrades-thanks-to-Mode.patch 1970-01-01 01:00:00.000000000 +0100
+++ reprepro-4.2.0-2/debian/patches/0004-add-support-for-ButAutomaticUpgrades-thanks-to-Mode.patch 2010-10-24 11:14:27.000000000 +0200
@@ -0,0 +1,114 @@
+From 05d098def85d78f311d595482f7617bc9fc136b8 Mon Sep 17 00:00:00 2001
+From: Bernhard R. Link <brlink@debian.org>
+Date: Sat, 16 Oct 2010 12:47:56 +0000
+Subject: add support for ButAutomaticUpgrades (thanks to Modesta Vainius)
+
+---
+ distribution.c | 3 +++
+ distribution.h | 3 ++-
+ docs/manual.html | 3 ++-
+ docs/reprepro.1 | 7 +++++++
+ release.c | 6 ++++++
+ 5 files changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/distribution.c b/distribution.c
+index 5c657d4..5e39965 100644
+--- a/distribution.c
++++ b/distribution.c
+@@ -52,6 +52,7 @@ static retvalue distribution_free(struct distribution *distribution) {
+ free(distribution->version);
+ free(distribution->origin);
+ free(distribution->notautomatic);
++ free(distribution->butautomaticupgrades);
+ free(distribution->label);
+ free(distribution->description);
+ free(distribution->signwith);
+@@ -387,6 +388,7 @@ CFallSETPROC(distribution, suite)
+ CFallSETPROC(distribution, version)
+ CFallSETPROC(distribution, origin)
+ CFallSETPROC(distribution, notautomatic)
++CFallSETPROC(distribution, butautomaticupgrades)
+ CFtruthSETPROC2(distribution, readonly, readonly)
+ CFallSETPROC(distribution, label)
+ CFallSETPROC(distribution, description)
+@@ -450,6 +452,7 @@ static const struct configfield distributionconfigfields[] = {
+ CF("Label", distribution, label),
+ CF("Log", distribution, logger),
+ CF("NotAutomatic", distribution, notautomatic),
++ CF("ButAutomaticUpgrades", distribution, butautomaticupgrades),
+ CF("Origin", distribution, origin),
+ CF("Pull", distribution, pulls),
+ CF("ReadOnly", distribution, readonly),
+diff --git a/distribution.h b/distribution.h
+index b62269a..5547c4a 100644
+--- a/distribution.h
++++ b/distribution.h
+@@ -35,7 +35,8 @@ struct distribution {
+ * generated, may be NULL. only suite is sometimes used
+ * (and only for sanity checks) */
+ /*@null@*/char *suite,*version;
+- /*@null@*/char *origin,*label,*description,*notautomatic;
++ /*@null@*/char *origin, *label, *description,
++ *notautomatic, *butautomaticupgrades;
+ /* What architectures and components are there */
+ struct atomlist architectures, components;
+ /* which update rules to use */
+diff --git a/docs/manual.html b/docs/manual.html
+index 0e4c4d1..1d4d1a8 100644
+--- a/docs/manual.html
++++ b/docs/manual.html
+@@ -528,7 +528,8 @@ The following headers are copied verbatim to the Release file, if they exist:
+ <tt class="header">Architectures</tt> (excluding a possible value "<tt>source</tt>"),
+ <tt class="header">Components</tt>,
+ <tt class="header">Description</tt>, and
+-<tt class="header">NotAutomatic</tt>.
++<tt class="header">NotAutomatic</tt>,
++<tt class="header">ButAutomaticUpgrades</tt>.
+ <h4><a name="compression">Choosing compression and file names</a></h4>
+ Depending on the type of the index files, different files are generated.
+ No specifying anything is equivalent to:
+diff --git a/docs/reprepro.1 b/docs/reprepro.1
+index 1784ea5..ffa2d1f 100644
+--- a/docs/reprepro.1
++++ b/docs/reprepro.1
+@@ -1087,6 +1087,13 @@ Release files.
+ though anything but \fByes\fP does make much
+ sense right now.)
+ .TP
++.B ButAutomaticUpgrades
++This optional field is simply copied into the
++Release files.
++(The value is handled as arbitrary string,
++though anything but \fByes\fP does make much
++sense right now.)
++.TP
+ .B Description
+ This optional field is simply copied into the
+ Release files.
+diff --git a/release.c b/release.c
+index d9e6faa..4a5097e 100644
+--- a/release.c
++++ b/release.c
+@@ -1131,6 +1131,8 @@ retvalue release_directorydescription(struct release *release, const struct dist
+ release_writeheader("Architecture",
+ atoms_architectures[target->architecture_atom]);
+ release_writeheader("NotAutomatic",distribution->notautomatic);
++ release_writeheader("ButAutomaticUpgrades",
++ distribution->butautomaticupgrades);
+ release_writeheader("Description",distribution->description);
+ #undef release_writeheader
+ r = release_finishfile(release, f);
+@@ -1291,6 +1293,10 @@ retvalue release_prepare(struct release *release, struct distribution *distribut
+ writestring("\nNotAutomatic: ");
+ writestring(distribution->notautomatic);
+ }
++ if( distribution->butautomaticupgrades != NULL ) {
++ writestring("\nButAutomaticUpgrades: ");
++ writestring(distribution->butautomaticupgrades);
++ }
+ writechar('\n');
+
+ for( cs = cs_md5sum ; cs < cs_hashCOUNT ; cs++ ) {
+--
+1.5.6.5
+
diff -ruN reprepro-4.2.0-1/debian/patches/0005-fix-typos-in-manpage.patch reprepro-4.2.0-2/debian/patches/0005-fix-typos-in-manpage.patch
--- reprepro-4.2.0-1/debian/patches/0005-fix-typos-in-manpage.patch 1970-01-01 01:00:00.000000000 +0100
+++ reprepro-4.2.0-2/debian/patches/0005-fix-typos-in-manpage.patch 2010-10-24 11:14:27.000000000 +0200
@@ -0,0 +1,36 @@
+From 6fb57dc033bb873d13e3827c9fcb20aca6ca5cec Mon Sep 17 00:00:00 2001
+From: Bernhard R. Link <brlink@debian.org>
+Date: Sun, 24 Oct 2010 08:58:11 +0000
+Subject: fix typos in manpage
+
+---
+ docs/reprepro.1 | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/docs/reprepro.1 b/docs/reprepro.1
+index ffa2d1f..e993ed8 100644
+--- a/docs/reprepro.1
++++ b/docs/reprepro.1
+@@ -1083,15 +1083,15 @@ Release files.
+ .B NotAutomatic
+ This optional field is simply copied into the
+ Release files.
+-(The value is handled as arbitrary string,
+-though anything but \fByes\fP does make much
++(The value is handled as an arbitrary string,
++though anything but \fByes\fP does not make much
+ sense right now.)
+ .TP
+ .B ButAutomaticUpgrades
+ This optional field is simply copied into the
+ Release files.
+-(The value is handled as arbitrary string,
+-though anything but \fByes\fP does make much
++(The value is handled as an arbitrary string,
++though anything but \fByes\fP does not make much
+ sense right now.)
+ .TP
+ .B Description
+--
+1.5.6.5
+
diff -ruN reprepro-4.2.0-1/debian/patches/series reprepro-4.2.0-2/debian/patches/series
--- reprepro-4.2.0-1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ reprepro-4.2.0-2/debian/patches/series 2010-10-24 11:14:27.000000000 +0200
@@ -0,0 +1,5 @@
+0001-include-sys-stat-in-filecntl.c.patch
+0002-Fix-error-in-reoverride-with-packages-that-have-a.patch
+0003-replace-sn-with-no-copy-in-changelogs.example.patch
+0004-add-support-for-ButAutomaticUpgrades-thanks-to-Mode.patch
+0005-fix-typos-in-manpage.patch
diff -ruN reprepro-4.2.0-1/distribution.c reprepro-4.2.0-2/distribution.c
--- reprepro-4.2.0-1/distribution.c 2010-07-11 12:16:00.000000000 +0200
+++ reprepro-4.2.0-2/distribution.c 2010-10-24 11:27:35.000000000 +0200
@@ -52,6 +52,7 @@
free(distribution->version);
free(distribution->origin);
free(distribution->notautomatic);
+ free(distribution->butautomaticupgrades);
free(distribution->label);
free(distribution->description);
free(distribution->signwith);
@@ -387,6 +388,7 @@
CFallSETPROC(distribution, version)
CFallSETPROC(distribution, origin)
CFallSETPROC(distribution, notautomatic)
+CFallSETPROC(distribution, butautomaticupgrades)
CFtruthSETPROC2(distribution, readonly, readonly)
CFallSETPROC(distribution, label)
CFallSETPROC(distribution, description)
@@ -450,6 +452,7 @@
CF("Label", distribution, label),
CF("Log", distribution, logger),
CF("NotAutomatic", distribution, notautomatic),
+ CF("ButAutomaticUpgrades", distribution, butautomaticupgrades),
CF("Origin", distribution, origin),
CF("Pull", distribution, pulls),
CF("ReadOnly", distribution, readonly),
diff -ruN reprepro-4.2.0-1/distribution.h reprepro-4.2.0-2/distribution.h
--- reprepro-4.2.0-1/distribution.h 2010-07-11 12:16:00.000000000 +0200
+++ reprepro-4.2.0-2/distribution.h 2010-10-24 11:27:35.000000000 +0200
@@ -35,7 +35,8 @@
* generated, may be NULL. only suite is sometimes used
* (and only for sanity checks) */
/*@null@*/char *suite,*version;
- /*@null@*/char *origin,*label,*description,*notautomatic;
+ /*@null@*/char *origin, *label, *description,
+ *notautomatic, *butautomaticupgrades;
/* What architectures and components are there */
struct atomlist architectures, components;
/* which update rules to use */
diff -ruN reprepro-4.2.0-1/docs/changelogs.example reprepro-4.2.0-2/docs/changelogs.example
--- reprepro-4.2.0-1/docs/changelogs.example 2010-07-11 12:16:06.000000000 +0200
+++ reprepro-4.2.0-2/docs/changelogs.example 2010-10-24 11:27:35.000000000 +0200
@@ -51,7 +51,7 @@
echo "extract $CANONDSCFILE information to $TARGETDIR"
mkdir -p -- "$TARGETDIR"
EXTRACTDIR="$(mktemp -d)"
- (cd -- "$EXTRACTDIR" && dpkg-source -sn -x "$CANONDSCFILE" > /dev/null)
+ (cd -- "$EXTRACTDIR" && dpkg-source --no-copy -x "$CANONDSCFILE" > /dev/null)
install -D -- "$EXTRACTDIR"/*/debian/copyright "$TARGETDIR/copyright"
install -D -- "$EXTRACTDIR"/*/debian/changelog "$TARGETDIR/changelog"
chmod -R u+rwX -- "$EXTRACTDIR"
diff -ruN reprepro-4.2.0-1/docs/manual.html reprepro-4.2.0-2/docs/manual.html
--- reprepro-4.2.0-1/docs/manual.html 2010-02-16 16:50:29.000000000 +0100
+++ reprepro-4.2.0-2/docs/manual.html 2010-10-24 11:27:35.000000000 +0200
@@ -528,7 +528,8 @@
<tt class="header">Architectures</tt> (excluding a possible value "<tt>source</tt>"),
<tt class="header">Components</tt>,
<tt class="header">Description</tt>, and
-<tt class="header">NotAutomatic</tt>.
+<tt class="header">NotAutomatic</tt>,
+<tt class="header">ButAutomaticUpgrades</tt>.
<h4><a name="compression">Choosing compression and file names</a></h4>
Depending on the type of the index files, different files are generated.
No specifying anything is equivalent to:
diff -ruN reprepro-4.2.0-1/docs/reprepro.1 reprepro-4.2.0-2/docs/reprepro.1
--- reprepro-4.2.0-1/docs/reprepro.1 2010-07-11 12:39:04.000000000 +0200
+++ reprepro-4.2.0-2/docs/reprepro.1 2010-10-24 11:27:35.000000000 +0200
@@ -1083,8 +1083,15 @@
.B NotAutomatic
This optional field is simply copied into the
Release files.
-(The value is handled as arbitrary string,
-though anything but \fByes\fP does make much
+(The value is handled as an arbitrary string,
+though anything but \fByes\fP does not make much
+sense right now.)
+.TP
+.B ButAutomaticUpgrades
+This optional field is simply copied into the
+Release files.
+(The value is handled as an arbitrary string,
+though anything but \fByes\fP does not make much
sense right now.)
.TP
.B Description
diff -ruN reprepro-4.2.0-1/filecntl.c reprepro-4.2.0-2/filecntl.c
--- reprepro-4.2.0-1/filecntl.c 2009-01-03 22:48:36.000000000 +0100
+++ reprepro-4.2.0-2/filecntl.c 2010-10-24 11:27:35.000000000 +0200
@@ -12,6 +12,7 @@
#include <stdbool.h>
#include <stdlib.h>
#include <unistd.h>
+#include <sys/stat.h>
#include <fcntl.h>
#include <stdio.h>
#include <errno.h>
diff -ruN reprepro-4.2.0-1/override.c reprepro-4.2.0-2/override.c
--- reprepro-4.2.0-1/override.c 2010-07-11 12:16:03.000000000 +0200
+++ reprepro-4.2.0-2/override.c 2010-10-24 11:27:35.000000000 +0200
@@ -382,6 +382,8 @@
return RET_ERROR_OOM;
}
}
+ if( fields == NULL )
+ return RET_NOTHING;
*fields_p = fields;
return RET_OK;
}
diff -ruN reprepro-4.2.0-1/release.c reprepro-4.2.0-2/release.c
--- reprepro-4.2.0-1/release.c 2010-07-11 12:16:03.000000000 +0200
+++ reprepro-4.2.0-2/release.c 2010-10-24 11:27:35.000000000 +0200
@@ -1131,6 +1131,8 @@
release_writeheader("Architecture",
atoms_architectures[target->architecture_atom]);
release_writeheader("NotAutomatic",distribution->notautomatic);
+ release_writeheader("ButAutomaticUpgrades",
+ distribution->butautomaticupgrades);
release_writeheader("Description",distribution->description);
#undef release_writeheader
r = release_finishfile(release, f);
@@ -1291,6 +1293,10 @@
writestring("\nNotAutomatic: ");
writestring(distribution->notautomatic);
}
+ if( distribution->butautomaticupgrades != NULL ) {
+ writestring("\nButAutomaticUpgrades: ");
+ writestring(distribution->butautomaticupgrades);
+ }
writechar('\n');
for( cs = cs_md5sum ; cs < cs_hashCOUNT ; cs++ ) {
diff -ruN reprepro-4.2.0-1/sources.c reprepro-4.2.0-2/sources.c
--- reprepro-4.2.0-1/sources.c 2010-07-11 12:16:04.000000000 +0200
+++ reprepro-4.2.0-2/sources.c 2010-10-24 11:27:35.000000000 +0200
@@ -336,7 +336,7 @@
return RET_NOTHING;
r = override_allreplacefields(o, &fields);
- if( RET_WAS_ERROR(r) )
+ if( !RET_IS_OK(r) )
return r;
newchunk = chunk_replacefields(controlchunk, fields,
"Directory", true);
diff -ruN reprepro_4.2.0-1/DEBIAN/control reprepro_4.2.0-2/DEBIAN/control
--- reprepro_4.2.0-1/DEBIAN/control 2010-07-11 12:43:12.000000000 +0200
+++ reprepro_4.2.0-2/DEBIAN/control 2010-10-24 11:22:56.000000000 +0200
@@ -1,5 +1,5 @@
Package: reprepro
-Version: 4.2.0-1
+Version: 4.2.0-2
Architecture: sparc
Maintainer: Bernhard R. Link <brlink@debian.org>
Installed-Size: 1024
diff -ruN reprepro_4.2.0-1/DEBIAN/md5sums reprepro_4.2.0-2/DEBIAN/md5sums
--- reprepro_4.2.0-1/DEBIAN/md5sums 2010-10-24 11:27:18.000000000 +0200
+++ reprepro_4.2.0-2/DEBIAN/md5sums 2010-10-24 11:27:32.000000000 +0200
@@ -1,26 +1,26 @@
-340fd9566817b29244c43066e637aace usr/bin/changestool
-eb9578ea958211fd3d0acc7a7c9f3549 usr/bin/reprepro
-d978fc3384c46d5d7df4236a94169fa3 usr/bin/rredtool
+117f9a2e0403b1a5b48c379f25cbc187 usr/bin/changestool
+fbb2a0991d391b62c9f2143b0930009d usr/bin/reprepro
+51eb1d4bc7514821fa86e0e713d78ad5 usr/bin/rredtool
9eebcd5853c2c8b8e8076e2152c8b41e usr/share/doc-base/reprepro
76f3022cae185ec0699f639099af0332 usr/share/doc/reprepro/FAQ.gz
c07ed77f10acb332af8ffe9005d877d0 usr/share/doc/reprepro/NEWS.gz
798f3d5d64ff39786aa586e728574a19 usr/share/doc/reprepro/README
78da8594101caa835230f4a3159389b9 usr/share/doc/reprepro/README.Debian
b37c79554960feb3aeb2236a5e1695ee usr/share/doc/reprepro/TODO
-c4e07ba5f80a4747c387d3964c023ee6 usr/share/doc/reprepro/changelog.Debian.gz
+3300702ac95d85930567ea1b78e84f76 usr/share/doc/reprepro/changelog.Debian.gz
97edbb53d4cdd12777a27574b9a3ee3d usr/share/doc/reprepro/changelog.gz
e4bb1498b6f1d1f09f8ac16d466f20b9 usr/share/doc/reprepro/copyright
1da86e7265847f906394650ca71c95a8 usr/share/doc/reprepro/examples/bzip.example
-70678aa9c2079220bdd1ffdf951c4a9d usr/share/doc/reprepro/examples/changelogs.example.gz
+1bf1b28f7721d6a9e650db2f32199f22 usr/share/doc/reprepro/examples/changelogs.example.gz
125a5b4b8d9fcda53c6fad69be0c6a4e usr/share/doc/reprepro/examples/di.example/DI-filter.sh
7d254ee455ac1bb6d416d264c9ed03bb usr/share/doc/reprepro/examples/di.example/README
41eb69699248e5f1964a65c5b8e0167c usr/share/doc/reprepro/examples/di.example/distributions
670fbd25dbcb2ca4302fc804f6758cba usr/share/doc/reprepro/examples/di.example/updates
cb93315ed77396a17d9ad1f68e5a4ae5 usr/share/doc/reprepro/examples/reprepro.zsh_completion.gz
c0a3ce5d1ba296b7ae55c230b8a53a65 usr/share/doc/reprepro/examples/tiffany.example.gz
-3427587e91f24d9a29b69fb5d6240afe usr/share/doc/reprepro/manual.html
+c05c560d15d5eab3bfb111391394170f usr/share/doc/reprepro/manual.html
46f3e76937a8538d65b5f2b8ed951418 usr/share/doc/reprepro/recovery
48a502bee2bebe782de2aa0cc529d2a4 usr/share/doc/reprepro/short-howto.gz
85f5a3c109a40b5285d242ee47a5ffab usr/share/man/man1/changestool.1.gz
-235806b2982fc76fbc87af9dcc199a68 usr/share/man/man1/reprepro.1.gz
+69d42da2b239aa5b18582814324279cd usr/share/man/man1/reprepro.1.gz
edf29991b38c363197c79e71b4e08e74 usr/share/man/man1/rredtool.1.gz
Binary files reprepro_4.2.0-1/usr/bin/changestool and reprepro_4.2.0-2/usr/bin/changestool differ
Binary files reprepro_4.2.0-1/usr/bin/reprepro and reprepro_4.2.0-2/usr/bin/reprepro differ
Binary files reprepro_4.2.0-1/usr/bin/rredtool and reprepro_4.2.0-2/usr/bin/rredtool differ
diff -ruN reprepro_4.2.0-1/usr/share/doc/reprepro/changelog.Debian reprepro_4.2.0-2/usr/share/doc/reprepro/changelog.Debian
--- reprepro_4.2.0-1/usr/share/doc/reprepro/changelog.Debian 2010-07-11 12:24:26.000000000 +0200
+++ reprepro_4.2.0-2/usr/share/doc/reprepro/changelog.Debian 2010-10-24 11:14:27.000000000 +0200
@@ -1,3 +1,13 @@
+reprepro (4.2.0-2) unstable; urgency=low
+
+ * include sys/stat.h in filecntl.h (Closes: 600982)
+ * Don't get confused with packages only having special override
+ entries
+ * adopt changelogs.example to new dpkg-source
+ * add support for ButAutomaticUpgrades (Closes: 600358)
+
+ -- Bernhard R. Link <brlink@debian.org> Fri, 22 Oct 2010 16:54:03 +0200
+
reprepro (4.2.0-1) unstable; urgency=low
* Fix Berkley -> Berkeley (Closes: 586899)
diff -ruN reprepro_4.2.0-1/usr/share/doc/reprepro/examples/changelogs.example reprepro_4.2.0-2/usr/share/doc/reprepro/examples/changelogs.example
--- reprepro_4.2.0-1/usr/share/doc/reprepro/examples/changelogs.example 2010-07-11 12:16:06.000000000 +0200
+++ reprepro_4.2.0-2/usr/share/doc/reprepro/examples/changelogs.example 2010-10-24 11:14:27.000000000 +0200
@@ -51,7 +51,7 @@
echo "extract $CANONDSCFILE information to $TARGETDIR"
mkdir -p -- "$TARGETDIR"
EXTRACTDIR="$(mktemp -d)"
- (cd -- "$EXTRACTDIR" && dpkg-source -sn -x "$CANONDSCFILE" > /dev/null)
+ (cd -- "$EXTRACTDIR" && dpkg-source --no-copy -x "$CANONDSCFILE" > /dev/null)
install -D -- "$EXTRACTDIR"/*/debian/copyright "$TARGETDIR/copyright"
install -D -- "$EXTRACTDIR"/*/debian/changelog "$TARGETDIR/changelog"
chmod -R u+rwX -- "$EXTRACTDIR"
diff -ruN reprepro_4.2.0-1/usr/share/doc/reprepro/manual.html reprepro_4.2.0-2/usr/share/doc/reprepro/manual.html
--- reprepro_4.2.0-1/usr/share/doc/reprepro/manual.html 2010-02-16 16:50:29.000000000 +0100
+++ reprepro_4.2.0-2/usr/share/doc/reprepro/manual.html 2010-10-24 11:14:27.000000000 +0200
@@ -528,7 +528,8 @@
<tt class="header">Architectures</tt> (excluding a possible value "<tt>source</tt>"),
<tt class="header">Components</tt>,
<tt class="header">Description</tt>, and
-<tt class="header">NotAutomatic</tt>.
+<tt class="header">NotAutomatic</tt>,
+<tt class="header">ButAutomaticUpgrades</tt>.
<h4><a name="compression">Choosing compression and file names</a></h4>
Depending on the type of the index files, different files are generated.
No specifying anything is equivalent to:
diff -ruN reprepro_4.2.0-1/usr/share/man/man1/reprepro.1 reprepro_4.2.0-2/usr/share/man/man1/reprepro.1
--- reprepro_4.2.0-1/usr/share/man/man1/reprepro.1 2010-07-11 12:42:52.000000000 +0200
+++ reprepro_4.2.0-2/usr/share/man/man1/reprepro.1 2010-10-24 11:22:37.000000000 +0200
@@ -1083,8 +1083,15 @@
.B NotAutomatic
This optional field is simply copied into the
Release files.
-(The value is handled as arbitrary string,
-though anything but \fByes\fP does make much
+(The value is handled as an arbitrary string,
+though anything but \fByes\fP does not make much
+sense right now.)
+.TP
+.B ButAutomaticUpgrades
+This optional field is simply copied into the
+Release files.
+(The value is handled as an arbitrary string,
+though anything but \fByes\fP does not make much
sense right now.)
.TP
.B Description
Reply to: