Hello community, here is the log from the commit of package checkmedia for openSUSE:Factory checked in at 2014-10-15 16:41:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/checkmedia (Old) and /work/SRC/openSUSE:Factory/.checkmedia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "checkmedia" Changes: -------- --- /work/SRC/openSUSE:Factory/checkmedia/checkmedia.changes 2014-05-02 20:52:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.checkmedia.new/checkmedia.changes 2014-10-15 16:42:01.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Oct 14 17:03:58 CEST 2014 - [email protected] + +- added 'archive' Makefile target +- update git2log +- 3.3 + +------------------------------------------------------------------- Old: ---- checkmedia-3.2.tar.xz New: ---- checkmedia-3.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ checkmedia.spec ++++++ --- /var/tmp/diff_new_pack.JmVNW5/_old 2014-10-15 16:42:02.000000000 +0200 +++ /var/tmp/diff_new_pack.JmVNW5/_new 2014-10-15 16:42:02.000000000 +0200 @@ -20,7 +20,7 @@ Summary: Check Installation Media License: GPL-3.0+ Group: System/Management -Version: 3.2 +Version: 3.3 Release: 0 Url: https://github.com/wfeldt/checkmedia.git Source: %{name}-%{version}.tar.xz ++++++ checkmedia-3.2.tar.xz -> checkmedia-3.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/checkmedia-3.2/Makefile new/checkmedia-3.3/Makefile --- old/checkmedia-3.2/Makefile 2014-04-30 08:24:48.000000000 +0200 +++ new/checkmedia-3.3/Makefile 2014-10-14 16:58:52.000000000 +0200 @@ -25,9 +25,11 @@ install: checkmedia install -m 755 -D checkmedia tagmedia $(DESTDIR)/usr/bin -package: +archive: changelog mkdir -p package - git archive --prefix=$(PREFIX)/ $(BRANCH) | xz -c > package/$(PREFIX).tar.xz + git archive --prefix=$(PREFIX)/ $(BRANCH) > package/$(PREFIX).tar + tar -r -f package/$(PREFIX).tar --mode=0664 --owner=root --group=root --mtime="`git show -s --format=%ci`" --transform='s:^:$(PREFIX)/:' VERSION changelog + xz -f package/$(PREFIX).tar clean: rm -rf $(OBJ) package checkmedia *~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/checkmedia-3.2/VERSION new/checkmedia-3.3/VERSION --- old/checkmedia-3.2/VERSION 1970-01-01 01:00:00.000000000 +0100 +++ new/checkmedia-3.3/VERSION 2014-10-14 16:58:52.000000000 +0200 @@ -0,0 +1 @@ +3.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/checkmedia-3.2/changelog new/checkmedia-3.3/changelog --- old/checkmedia-3.2/changelog 1970-01-01 01:00:00.000000000 +0100 +++ new/checkmedia-3.3/changelog 2014-10-14 16:58:52.000000000 +0200 @@ -0,0 +1,15 @@ +2014-10-14: 3.3 + - added 'archive' Makefile target + - update git2log + +2014-04-30: 3.2 + - added 'package' target to Makefile + - ignore padding area when calculating checksum (bnc #804160) + +2013-11-05: 3.1 + - make sure WORDS_BIGENDIAN is defined correctly where needed + (bigendian.patch) - fixes checkmedia on bigedian platform + +2012-01-25: 3.0 + - new major version + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/checkmedia-3.2/git2log new/checkmedia-3.3/git2log --- old/checkmedia-3.2/git2log 2014-04-30 08:24:48.000000000 +0200 +++ new/checkmedia-3.3/git2log 2014-10-14 16:58:52.000000000 +0200 @@ -2,6 +2,11 @@ use Getopt::Long; +use Data::Dumper; +$Data::Dumper::Sortkeys = 1; +$Data::Dumper::Terse = 1; +$Data::Dumper::Indent = 1; + sub usage; usage 0 if !@ARGV; @@ -62,20 +67,20 @@ @tags = sort @ntags; -die "no tags?\n" unless @tags; +die "no tags at all?\n" unless @tags; -if($opt_version) { - $t = $tags[-1]; - $t =~ s/(\d+)/$1 + 0/eg; +$current_version = $tags[-1]; +$current_version =~ s/(\d+)/$1 + 0/eg; - if(`git log --pretty=medium --date=iso '$t..HEAD'`) { - $t =~ s/(\d+)$/$1 + 1/e; - } +if(`git log --pretty=medium --date=iso '$current_version..HEAD'`) { + $current_version =~ s/(\d+)$/$1 + 1/e; +} - $t =~ s/^$branch\-//; +$current_version =~ s/^$branch\-//; +if($opt_version) { open F, ">$opt_file"; - print F "$t\n"; + print F "$current_version\n"; close F; exit 0; @@ -92,11 +97,16 @@ # print STDERR ">> $branch-$bi\n"; - die "no tags in this branch?\n" unless $bi; + warn "no tags in this branch yet\n" unless $bi; for ($i = 0; $i < $i2; $i++) { - if($tags[$i] eq $bi) { - $i1 = $i; + if($tags[$i] ge $bi) { + if($tags[$i] eq $bi) { + $i1 = $i; + } + elsif($i > 0) { + $i1 = $i - 1; + } last; } } @@ -106,15 +116,43 @@ map { s/(\d+)/$1 + 0/eg } @tags; -# for (@tags) { print "$_\n"; } - push @tags, "HEAD"; +# print Dumper(\@tags); + open F, ">$opt_file"; for ($i = @tags - 1; $i > 0; $i--) { $date = undef; @t = `git log --pretty=medium --date=iso '$tags[$i-1]..$tags[$i]'`; + + # print "\n--- $tags[$i-1]..$tags[$i] ---\n", @t, "---\n"; + + undef @t2; + $merge = 0; + for (@t) { + $merge = 1 if /^Merge: /; + $merge = 0 if /^commit /; + push @t2, $_ if !$merge; + } + @t = @t2; + + undef @t2; + $detail = 0; + for (@t) { + $detail = 1 if /^ $/; + $detail = 0 if /^commit /; + if($detail && /^ [^\-\s]/) { + # push @t2, "# $_"; + } + else { + push @t2, $_; + } + } + @t = @t2; + + # print "\n--- $tags[$i-1]..$tags[$i] ---\n", @t; + chomp @t; for (@t) { if(/^Date:\s*(\S+)/) { @@ -131,12 +169,17 @@ map { s/feat(\.|ure)?\s*#?(\d+)/fate #$2/g } @t; map { s/^ {4}// } @t; map { s/^ {8}// } @t; - map { s/^([^-\s])/- $1/ } @t; - map { s/^- - /- / } @t; - map { s/^- \+\s+(- )?/- / } @t; + map { s/^ +/ / } @t; + map { s/^\s*[+\-][\-\s]*/- / } @t; + map { s/^([^ \-])/- $1/ } @t; map { s/^/\t/ } @t; + map { s/\\'/'/ } @t; + +# print "\n--- $tags[$i-1]..$tags[$i] ---\n", join("\n", @t); + $t = $tags[$i]; $t = "${branch}-$t" if $branch ne 'master' && $t eq "HEAD"; + $t =~ s/HEAD/$current_version/; print F "$date:\t$t\n"; print F join("\n", @t), "\n\n"; } @@ -160,4 +203,3 @@ exit $err; } - -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
