diff options
-rw-r--r-- | Makefile.in | 12 | ||||
-rwxr-xr-x | changes2changelog | 21 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | po/de.po | 8 | ||||
-rw-r--r-- | po/fr.po | 40 | ||||
-rw-r--r-- | quilt.changes | 12 | ||||
-rw-r--r-- | test/perms.test | 65 |
7 files changed, 104 insertions, 58 deletions
diff --git a/Makefile.in b/Makefile.in index 96c7fc9..49d2697 100644 --- a/Makefile.in +++ b/Makefile.in @@ -96,6 +96,7 @@ SRC += $(PO:%=po/%) DIRT += po/*.mo SRC += $(wildcard test/*.test) test/run +SRC += changes2changelog #----------------------------------------------------------------------- @@ -192,16 +193,7 @@ $(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile \ @sed -e 's/^\(Version:[ \t]*\).*/\1$(VERSION)/' \ -e 's/^\(Release:[ \t]\).*/\1$(RELEASE)/' \ < $< > $@ - @perl -ne ' \ - m/^(|-+)$$/ and next; \ - ( \ - s/^(...) \s (...) \s (.\d) \s (\d\d:\d\d:\d\d) \s \ - ([A-Z]+|[-+]\d{4}) \s (\d\d\d\d) \s - \s (.+) \ - /* $$1 $$2 $$3 $$6 - $$7/x || \ - m/^(- | +)(?!\s)/ \ - and print \ - ) or die "Syntax error in line $$. of changelog:\n$$_\n"; \ - ' $(PACKAGE).changes \ + @./changes2changelog $(PACKAGE).changes \ | scripts/parse-patch -u changelog $@ % : %.in diff --git a/changes2changelog b/changes2changelog new file mode 100755 index 0000000..07c7afa --- /dev/null +++ b/changes2changelog @@ -0,0 +1,21 @@ +#! /usr/bin/perl + +while (<>) { + if (/^(|-+)$/) { + next; + } elsif (/^(\S.*) - (.*@.*)$/) { + # print "[" . $1 . "]\n"; + open FH, 'date -u +"* %a %b %d %Y" -d "' . $1 . '" |'; + while (<FH>) { + chomp; + print $_ . " - " . $2 . "\n"; + } + close FH; + next; + } elsif (/(- | +)(?!\s)/) { + print; + } else { + print STDERR "Syntax error in line $. of changelog:\n$_\n"; + exit 1; + } +} diff --git a/configure.ac b/configure.ac index bf33836..9e1884c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([quilt],[0.34],[quilt-dev@nongnu.org]) +AC_INIT([quilt],[0.35],[quilt-dev@nongnu.org]) AC_CONFIG_AUX_DIR(config) AC_PREREQ(2.53) -AC_REVISION ($Revision: 1.29 $) +AC_REVISION ($Revision: 1.30 $) PACKAGE_RELEASE=1 AC_SUBST(PACKAGE_RELEASE) @@ -282,15 +282,14 @@ msgid "Usage: quilt edit file ...\\n" msgstr "Verwendung: quilt edit datei ...\\n" #: ../quilt/edit.in:16 -#, fuzzy msgid "" "\n" "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n" "the topmost patch.\n" msgstr "" "\n" -"Füge die angegebene(n) Datei(en) demobersten Patch hinzu, und editiere\n" -"sie dann in $EDITOR.\n" +"Füge die angegebene(n) Datei(en) dem obersten Patch hinzu, und editiere\n" +"sie dann in \\$EDITOR (%s).\n" #: ../quilt/files.in:22 msgid "Usage: quilt files [-v] [patch]\\n" @@ -983,9 +982,8 @@ msgstr "" "Bitte führen Sie \\`quilt upgrade' aus.\\n" #: ../scripts/rpatch.in:22 -#, fuzzy msgid "Usage: %s [-fRq] patchname\\n" -msgstr "Verwendung: $0 [-fRq] patchname\\n" +msgstr "Verwendung: %s [-fRq] patchname\\n" #: ../scripts/rpatch.in:100 msgid "Patch %s does not remove cleanly (enforce with -f)\\n" @@ -1019,43 +1019,3 @@ msgstr "Retrait de %s\\n" #: ../scripts/rpatch.in:179 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Le patch %s doit être rafraichi au préalable.\\n" - -#~ msgid "Patch $2 is not in series" -#~ msgstr "Le patch $2 n'est pas dans la série" - -#~ msgid "Patch $patch is not applied" -#~ msgstr "Le patch $patch n'est pas appliqué" - -#~ msgid "Usage: quilt applied [-n] [patch]" -#~ msgstr "Usage : quilt applied [-n] [patch]" - -#~ msgid "Patch $patch is not in series" -#~ msgstr "Le patch $patch n'est pas dans la série" - -#~ msgid "Patch $last_patch is not applied" -#~ msgstr "Le patch $last_patch ne semble pas appliqué" - -#~ msgid "Cannot change into $QUILT_PC/$last_patch" -#~ msgstr "Impossible d'entrer dans $QUILT_PC/$last_patch" - -#~ msgid "Patch $patch is applied." -#~ msgstr "Le patch $patch est appliqué." - -#~ msgid "" -#~ "Warning: directory $(echo $SUBDIR | sed -e 's:[^/]\\+:..:g')" -#~ "$QUILT_PATCHES exists; ignoring" -#~ msgstr "" -#~ "Attention : le répertoire $(echo $SUBDIR | sed -e 's:[^/]\\+:..:g')" -#~ "$QUILT_PATCHES existe; ignoré" - -#~ msgid "Patch $stop_at_patch is not applied." -#~ msgstr "Le patch $stop_at_patch n'est pas appliqué." - -#~ msgid "Patch $opt_patch is not in series" -#~ msgstr "Le patch $opt_patch est introuvable dans le fichier de série" - -#~ msgid "Directory $prefix$dir/$QUILT_PATCHES exists" -#~ msgstr "Le répertoire $prefix$dir/$QUILT_PATCHES existe" - -#~ msgid "File $prefix$dir/series exists" -#~ msgstr "Le fichier $prefix$dir/series existe." diff --git a/quilt.changes b/quilt.changes index 2cf249b..22981f8 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu Jul 15 02:25:44 CEST 2004 - agruen@suse.de + +- Add test case for permissions. +- Very minor translation updates. +- Convert timestamps in changes file into UTC when generating + the RPM changelog: the changelog does not understand + timestamps. +- Bump version to 0.35. + +------------------------------------------------------------------- Tue Jul 13 15:26:18 PDT 2004 - mquinson@tuxfamily.org - Fix a typo (s/prinf/printf/) reported by Dean Roehrich. @@ -31,7 +41,7 @@ Mon Jul 12 03:02:19 CEST 2004 - agruen@suse.de might be selected in some cases.) ------------------------------------------------------------------- -Tue Jul 6 18:58:00 CEST 2004 - agruen@suse.de +Tue Jul 9 07:26:23 CEST 2004 - agruen@suse.de - Switch from echo to printf for all translations: This is more stable than having expansions in messages that might change diff --git a/test/perms.test b/test/perms.test new file mode 100644 index 0000000..83327c5 --- /dev/null +++ b/test/perms.test @@ -0,0 +1,65 @@ + $ umask 022 + $ mkdir d + $ cd d + $ echo foo > foo + $ chmod 704 foo + $ ls -l foo | awk '{ print $1,$8 }' + > -rwx---r-- foo + + $ quilt new test.diff + > Patch %{P}test.diff is now on top + + $ quilt add foo + > File foo added to patch %{P}test.diff + + $ ls -l foo | awk '{ print $1,$8 }' + > -rwx---r-- foo + + $ echo foobar > foo + $ quilt ref + > Refreshed patch %{P}test.diff + + $ quilt new test2.diff + > Patch %{P}test2.diff is now on top + + $ quilt add foo + > File foo added to patch %{P}test2.diff + + $ chmod 702 foo + $ ls -l foo | awk '{ print $1,$8 }' + > -rwx----w- foo + + $ echo foobaz > foo + $ quilt ref + > Refreshed patch %{P}test2.diff + +The permissions of foo as they were in patch2 are lost here (there is no +way to preserve them in the patch). Quilt will restore the permissions of +the backup file. + + $ quilt pop -q + > Removing patch %{P}test2.diff + > Now at patch %{P}test.diff + + $ ls -l foo | awk '{ print $1,$8 }' + > -rwx---r-- foo + + $ quilt push -q + > Applying patch %{P}test2.diff + > Now at patch %{P}test2.diff + + $ ls -l foo | awk '{ print $1,$8 }' + > -rwx---r-- foo + + $ quilt pop -q + > Removing patch %{P}test2.diff + > Now at patch %{P}test.diff + + $ quilt remove foo + > File foo removed from patch %{P}test.diff + + $ ls -l foo | awk '{ print $1,$8 }' + > -rwx---r-- foo + + $ cd .. + $ rm -rf d |