Hello community, here is the log from the commit of package obs-service-set_version for openSUSE:Factory checked in at 2014-07-11 06:46:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-set_version (Old) and /work/SRC/openSUSE:Factory/.obs-service-set_version.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-set_version" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-set_version/obs-service-set_version.changes 2014-03-18 13:55:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.obs-service-set_version.new/obs-service-set_version.changes 2014-07-11 06:47:00.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Jul 9 12:02:43 UTC 2014 - jblu...@infradead.org + +- Update to version 0.4.1: + + Add support to automatically detect version based on Debian changelog file + + Initial debianization + + Handle PKGBUILD files generated by services + +------------------------------------------------------------------- New: ---- debian.dsc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.ncn6ot/_old 2014-07-11 06:47:01.000000000 +0200 +++ /var/tmp/diff_new_pack.ncn6ot/_new 2014-07-11 06:47:01.000000000 +0200 @@ -1,4 +1,4 @@ asd=yxc pkgrel=0 -md5sums=('c62a9acf229820070c178fab5d14cfee') +md5sums=('829bf5506328c711e7077400efc6feba') ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ncn6ot/_old 2014-07-11 06:47:01.000000000 +0200 +++ /var/tmp/diff_new_pack.ncn6ot/_new 2014-07-11 06:47:01.000000000 +0200 @@ -1,5 +1,5 @@ <servicedata> <service name="tar_scm"> <param name="url">g...@github.com:openSUSE/obs-service-set_version.git</param> - <param name="changesrevision">8c7f0634e6</param></service> + <param name="changesrevision">eab34cf8af</param></service> </servicedata> \ No newline at end of file ++++++ debian.dsc ++++++ Format: 1.0 Source: obs-service-set-version Version: 0.4.1 Binary: obs-service-set-version Maintainer: Adrian Schroeter <adr...@suse.de> Architecture: all Standards-Version: 3.7.2 Build-Depends: debhelper (>= 7) ++++++ obs-service-set_version-0.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-set_version-0.4.1/debian/changelog new/obs-service-set_version-0.4.1/debian/changelog --- old/obs-service-set_version-0.4.1/debian/changelog 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-service-set_version-0.4.1/debian/changelog 2014-07-09 16:09:37.000000000 +0200 @@ -0,0 +1,5 @@ +obs-service-set-version (0.4.1) unstable; urgency=low + + * Initial release + + -- Daniel Gollub <dgol...@brocade.com> Thu, 03 Jul 2014 09:04:52 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-set_version-0.4.1/debian/compat new/obs-service-set_version-0.4.1/debian/compat --- old/obs-service-set_version-0.4.1/debian/compat 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-service-set_version-0.4.1/debian/compat 2014-07-09 16:09:37.000000000 +0200 @@ -0,0 +1 @@ +8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-set_version-0.4.1/debian/control new/obs-service-set_version-0.4.1/debian/control --- old/obs-service-set_version-0.4.1/debian/control 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-service-set_version-0.4.1/debian/control 2014-07-09 16:09:37.000000000 +0200 @@ -0,0 +1,16 @@ +Source: obs-service-set-version +Section: devel +Priority: extra +Maintainer: Daniel Gollub <dgol...@brocade.com> +Build-Depends: debhelper (>= 8.0.0) +Standards-Version: 3.9.3 +Homepage: https://github.com/openSUSE/obs-service-set_version + +Package: obs-service-set-version +Architecture: all +Depends: ${misc:Depends}, sed +Description: An OBS source service: Update spec file version + This is a source service for openSUSE Build Service. + Very simply script to update the version in .spec or .dsc files according to + a given version or to the existing files. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-set_version-0.4.1/debian/copyright new/obs-service-set_version-0.4.1/debian/copyright --- old/obs-service-set_version-0.4.1/debian/copyright 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-service-set_version-0.4.1/debian/copyright 2014-07-09 16:09:37.000000000 +0200 @@ -0,0 +1,28 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: obs-service-set_version +Source: https://github.com/openSUSE/obs-service-set_version + +Files: * +Copyright: 2010 Adrian Schröter <adr...@suse.de> +License: GPL-2.0+ + +Files: debian/* +Copyright: 2014 Daniel Gollub <dgol...@brocade.com> +License: GPL-2.0+ + +License: GPL-2.0+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-set_version-0.4.1/debian/obs-service-set-version.install new/obs-service-set_version-0.4.1/debian/obs-service-set-version.install --- old/obs-service-set_version-0.4.1/debian/obs-service-set-version.install 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-service-set_version-0.4.1/debian/obs-service-set-version.install 2014-07-09 16:09:37.000000000 +0200 @@ -0,0 +1,2 @@ +set_version /usr/lib/obs/service/ +set_version.service /usr/lib/obs/service/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-set_version-0.4.1/debian/rules new/obs-service-set_version-0.4.1/debian/rules --- old/obs-service-set_version-0.4.1/debian/rules 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-service-set_version-0.4.1/debian/rules 2014-07-09 16:09:37.000000000 +0200 @@ -0,0 +1,7 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# +export DH_VERBOSE=1 + +%: + dh $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-set_version-0.4.1/debian/source/format new/obs-service-set_version-0.4.1/debian/source/format --- old/obs-service-set_version-0.4.1/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-service-set_version-0.4.1/debian/source/format 2014-07-09 16:09:37.000000000 +0200 @@ -0,0 +1 @@ +3.0 (quilt) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-set_version-0.4.1/set_version new/obs-service-set_version-0.4.1/set_version --- old/obs-service-set_version-0.4.1/set_version 2014-03-17 10:51:14.000000000 +0100 +++ new/obs-service-set_version-0.4.1/set_version 2014-07-09 16:09:37.000000000 +0200 @@ -113,6 +113,18 @@ } } +# Detect version based on Debian changelog +unless ($version) { + if (my $dch = glob("*debian.changelog")) { + open ( FH, "$dch" ); + my $line = <FH>; + if ($line =~ /.*\((.*)\).*/) { + $version=$1; + } + close( FH ); + } +} + # to replace tags in .spec and .dsc files sub replace_tag { my ($filename, $tag, $string) = @_; @@ -158,7 +170,8 @@ use Digest::MD5; # handle arch linux PKGBUILD files -if ( -e "PKGBUILD" ) { +@files = grep {$_ =~ /PKGBUILD$/} @srcfiles; +for my $pkgbuild (@files) { # find md5sum of tar ball my $md5sum; my $tarfile; @@ -184,7 +197,7 @@ close(FILE); die ("Failed to calculate md5sum") unless $md5sum; - replace_tag("PKGBUILD", "pkgver", $version); - replace_tag("PKGBUILD", "pkgrel", "0"); - replace_tag("PKGBUILD", "md5sums", "('".$md5sum."')"); + replace_tag($pkgbuild, "pkgver", $version); + replace_tag($pkgbuild, "pkgrel", "0"); + replace_tag($pkgbuild, "md5sums", "('".$md5sum."')"); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org