Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2014-10-14 07:10:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo" Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2014-08-20 17:54:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hwinfo.new/hwinfo.changes 2014-10-14 07:10:30.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Oct 13 16:05:32 CEST 2014 - [email protected] + +- added 'archive' Makefile target +- updated git2log script +- 21.7 + +------------------------------------------------------------------- Old: ---- hwinfo-21.6.tar.xz New: ---- hwinfo-21.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.shrFLQ/_old 2014-10-14 07:10:31.000000000 +0200 +++ /var/tmp/diff_new_pack.shrFLQ/_new 2014-10-14 07:10:31.000000000 +0200 @@ -36,9 +36,9 @@ Group: Hardware/Other # Until migration to github this should be correct url Url: http://gitorious.org/opensuse/hwinfo -Version: 21.6 +Version: 21.7 Release: 0 -Source: hwinfo-21.6.tar.xz +Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ hwinfo-21.6.tar.xz -> hwinfo-21.7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.6/.gitignore new/hwinfo-21.7/.gitignore --- old/hwinfo-21.6/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/hwinfo-21.7/.gitignore 2014-10-13 15:59:43.000000000 +0200 @@ -0,0 +1,7 @@ +changelog +Changelog +VERSION +*.o +.depend +hwinfo +hwinfo.pc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.6/MAINTAINER new/hwinfo-21.7/MAINTAINER --- old/hwinfo-21.6/MAINTAINER 1970-01-01 01:00:00.000000000 +0100 +++ new/hwinfo-21.7/MAINTAINER 2014-10-13 15:59:43.000000000 +0200 @@ -0,0 +1 @@ +Steffen Winterfeldt ([email protected]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.6/Makefile new/hwinfo-21.7/Makefile --- old/hwinfo-21.6/Makefile 2013-11-27 15:59:28.000000000 +0100 +++ new/hwinfo-21.7/Makefile 2014-10-13 15:59:43.000000000 +0200 @@ -14,8 +14,9 @@ GIT2LOG := $(shell if [ -x ./git2log ] ; then echo ./git2log --update ; else echo true ; fi) GITDEPS := $(shell [ -d .git ] && echo .git/HEAD .git/refs/heads .git/refs/tags) - VERSION := $(shell $(GIT2LOG) --version VERSION ; cat VERSION) +BRANCH := $(shell git branch | perl -ne 'print $$_ if s/^\*\s*//') +PREFIX := hwinfo-$(VERSION) include Makefile.common @@ -107,3 +108,9 @@ install -m 644 src/isdn/cdb/ISDN.CDB.txt $(DESTDIR)/usr/share/hwinfo install -m 644 src/isdn/cdb/ISDN.CDB.hwdb $(DESTDIR)/usr/share/hwinfo +archive: changelog + mkdir -p package + 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 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.6/Makefile.common new/hwinfo-21.7/Makefile.common --- old/hwinfo-21.6/Makefile.common 2013-10-07 13:45:32.000000000 +0200 +++ new/hwinfo-21.7/Makefile.common 2014-10-13 15:59:43.000000000 +0200 @@ -54,6 +54,7 @@ clean: subdirs @rm -rf $(OBJS) .depend $(CLEANFILES) *~ + @rm -rf package distclean: subdirs @rm -rf $(OBJS) .depend $(CLEANFILES) $(DISTCLEANFILES) *~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.6/VERSION new/hwinfo-21.7/VERSION --- old/hwinfo-21.6/VERSION 2014-08-15 11:11:18.000000000 +0200 +++ new/hwinfo-21.7/VERSION 2014-10-13 15:59:43.000000000 +0200 @@ -1 +1 @@ -21.6 +21.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.6/changelog new/hwinfo-21.7/changelog --- old/hwinfo-21.6/changelog 2014-08-15 11:11:23.000000000 +0200 +++ new/hwinfo-21.7/changelog 2014-10-13 15:59:43.000000000 +0200 @@ -1,4 +1,8 @@ -2014-08-15: HEAD +2014-10-13: 21.7 + - added 'archive' Makefile target + - updated git2log script + +2014-08-15: 21.6 - create floppy entry only if there really is a floppy device (bnc #883465) 2014-05-27: 21.5 @@ -7,9 +11,7 @@ 2014-04-24: 21.4 - don't dump netcard eeprom by default (bnc #875021) -2014-03-31: 21.3 - - Merge pull request #3 from openSUSE/bnc853635 - - Removed an unnecessary newline from dump_line call. +2014-03-28: 21.3 - Removed an unnecessary newline from dump_line call. h->rom_id for IUCV connections already has a newline at the end. - Changed the logic for IUCV detection to only include netiucv type devices @@ -23,9 +25,6 @@ 2014-03-24: 21.1 - show Consistant Device Name (CDN) as Device Name - - The Device name of a PCI or PCI Express device under OS may be exported - - by BIOS via label sysfs attribute. Read it and show it to the user as - - "Device Name:" (fate #316031, fate #315201). - s390: add some virtio device IDs (bnc #807532) - adding fingerprint reader (bnc #793928) - use 'cp -x' in getsysinfo (bnc #760240) @@ -40,19 +39,11 @@ 2013-11-27: 21.0 - read and add ethtool private flags (bnc 841170) - update pci id list (bnc #813172) - - Merge pull request #2 from andreas-schwab/master - - Add support for m68k - Add support for m68k -2013-08-20: 20.2 - - Merge pull request #1 from dirkmueller/aarch64 - - AArch64 support +2013-08-15: 20.2 - Add support for AArch64 - - Add a new CPU Arch Type, AArch64, and properly - - parse the /proc/cpuinfo (that is quite similar to ARM 32bit) - Remove various unused variables - - GCC 4.8 warns about them, and they seem to be entirely - - unused. - Fix sizing error in memset() call 2013-01-09: 20.1 @@ -139,8 +130,6 @@ 2009-09-30: 16.9 - Skip interfaces that have the SLAVE flag set - - Filter interfaces marked as SLAVE to avoid sending packets on passive - - NICs when using bonding. - recognize usb auto & smartcard devices (bnc #290279) 2009-09-28: 16.8 @@ -164,7 +153,7 @@ 2009-06-24: 16.3 - rewrote man page, help text & README (bnc #178662) - - --log without other options assumes --all (bnc #243103) + - log without other options assumes --all (bnc #243103) - fix build when as-needed is a default linker option 2009-06-15: 16.2 @@ -827,7 +816,7 @@ 2005-08-15: 11.11 - x11 update - - --save-config accepts all kind of things + - save-config accepts all kind of things - read modules.alias, not modules.pcimap - fixed usb device udi matching - assign input devices udi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.6/git2log new/hwinfo-21.7/git2log --- old/hwinfo-21.6/git2log 1970-01-01 01:00:00.000000000 +0100 +++ new/hwinfo-21.7/git2log 2014-10-13 15:59:43.000000000 +0200 @@ -0,0 +1,205 @@ +#! /usr/bin/perl + +use Getopt::Long; + +use Data::Dumper; +$Data::Dumper::Sortkeys = 1; +$Data::Dumper::Terse = 1; +$Data::Dumper::Indent = 1; + +sub usage; + +usage 0 if !@ARGV; + +@deps = qw ( .git/HEAD .git/refs/heads .git/refs/tags ); + +GetOptions( + 'help' => sub { usage 0 }, + 'version' => \$opt_version, + 'update' => \$opt_update, + 'log|changelog' => \$opt_log, +) || usage 1; + +usage 1 if @ARGV > 1 || !($opt_log || $opt_version); +$opt_file = @ARGV ? shift : '-'; + +die "no git repo\n" unless -d ".git"; + +if($opt_update && $opt_file ne '-' && -f($opt_file)) { + $ok = 1; + + $t = (stat $opt_file)[9]; + + for (@deps) { + $ok = 0 if (stat)[9] > $t; + } + + exit 0 if $ok; +} + +for (`git branch`) { + if(/^\*\s+(\S+)/) { + $branch = $1; + last; + } +} + +$branch = "master" if $branch eq '(no'; + +die "no branch?\n" unless $branch; + +# print STDERR "writing log for branch $branch\n"; + +@tags = `git tag`; + +chomp @tags; + +for (@tags) { + if(/^\d/) { + s/(\d+)/sprintf "%04d", $1/eg; + push @ntags, $_; + } + elsif(s/^$branch\-//) { + s/(\d+)/sprintf "%04d", $1/eg; + push @ntags, "$branch-$_"; + } +} + +@tags = sort @ntags; + +die "no tags at all?\n" unless @tags; + +$current_version = $tags[-1]; +$current_version =~ s/(\d+)/$1 + 0/eg; + +if(`git log --pretty=medium --date=iso '$current_version..HEAD'`) { + $current_version =~ s/(\d+)$/$1 + 1/e; +} + +$current_version =~ s/^$branch\-//; + +if($opt_version) { + open F, ">$opt_file"; + print F "$current_version\n"; + close F; + + exit 0; +} + +if($branch ne 'master') { + for ($i = 0; $i < @tags; $i++) { + if($tags[$i] =~ /^$branch\-(\S+)/) { + $i2 = $i; + $bi = $1; + last; + } + } + + # print STDERR ">> $branch-$bi\n"; + + warn "no tags in this branch yet\n" unless $bi; + + for ($i = 0; $i < $i2; $i++) { + if($tags[$i] ge $bi) { + if($tags[$i] eq $bi) { + $i1 = $i; + } + elsif($i > 0) { + $i1 = $i - 1; + } + last; + } + } + + splice @tags, $i1, $i2 - $i1; +} + +map { s/(\d+)/$1 + 0/eg } @tags; + +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+)/) { + $date = $1; + last; + } + } + @t = grep { !/^(commit|Author:|Date:|Merge:|\s*$)|created.*tag/ } @t; + if(@t) { + # rewrite a bit to have it look more consistent + map { s/(fate|bnc)#/$1 #/g } @t; + map { s/\(#/(bnc #/g } @t; + map { s/bug\s*#/bnc #/g } @t; + map { s/feat(\.|ure)?\s*#?(\d+)/fate #$2/g } @t; + map { s/^ {4}// } @t; + map { s/^ {8}// } @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"; + } +} + +close F; + +sub usage +{ + my $err = shift; + + print <<" usage"; +Usage: git2log [OPTIONS] [FILE] +Create changelog and project version from git repo. + --changelog Write changelog to FILE. + --version Write version number to FILE. + --update Write changelog or version only if FILE is outdated. + --help Print this help text. + usage + + exit $err; +} + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
