Hello community, here is the log from the commit of package kdesdk4-scripts for openSUSE:Factory checked in at 2013-12-02 12:36:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesdk4-scripts (Old) and /work/SRC/openSUSE:Factory/.kdesdk4-scripts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdesdk4-scripts" Changes: -------- --- /work/SRC/openSUSE:Factory/kdesdk4-scripts/kdesdk4-scripts.changes 2013-10-03 15:55:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdesdk4-scripts.new/kdesdk4-scripts.changes 2013-12-02 12:36:12.000000000 +0100 @@ -1,0 +2,21 @@ +Sat Nov 16 18:33:58 UTC 2013 - [email protected] + +- Update to 4.11.90 + * KDE 4.12 Beta 2 release + * See http://www.kde.org/announcements/announce-4.12-beta2.php + +------------------------------------------------------------------- +Sun Nov 10 08:05:35 UTC 2013 - [email protected] + +- Update to 4.11.80 + * KDE 4.12 Beta 1 release + * See http://www.kde.org/announcements/announce-4.12-beta1.php + +------------------------------------------------------------------- +Sat Nov 2 15:52:24 UTC 2013 - [email protected] + +- Update to 4.11.3 + * KDE 4.11.3 bugfix release + * See http://www.kde.org/announcements/announce-4.11.3.php + +------------------------------------------------------------------- Old: ---- kde-dev-scripts-4.11.2.tar.xz New: ---- kde-dev-scripts-4.11.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk4-scripts.spec ++++++ --- /var/tmp/diff_new_pack.sQqlPu/_old 2013-12-02 12:36:14.000000000 +0100 +++ /var/tmp/diff_new_pack.sQqlPu/_new 2013-12-02 12:36:14.000000000 +0100 @@ -24,7 +24,7 @@ License: GPL-2.0 and GFDL-1.2 Group: System/GUI/KDE Url: http://www.kde.org/ -Version: 4.11.2 +Version: 4.11.90 Release: 0 Source0: %{rname}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kde-dev-scripts-4.11.2.tar.xz -> kde-dev-scripts-4.11.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.11.2/CMakeLists.txt new/kde-dev-scripts-4.11.90/CMakeLists.txt --- old/kde-dev-scripts-4.11.2/CMakeLists.txt 2013-08-28 19:14:02.000000000 +0200 +++ new/kde-dev-scripts-4.11.90/CMakeLists.txt 2013-10-22 12:19:48.000000000 +0200 @@ -78,5 +78,6 @@ svnintegrate kde_generate_export_header kde-systemsettings-tree.py + reviewboard-am DESTINATION ${BIN_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.11.2/createtarball/config.ini new/kde-dev-scripts-4.11.90/createtarball/config.ini --- old/kde-dev-scripts-4.11.2/createtarball/config.ini 2013-08-28 19:14:02.000000000 +0200 +++ new/kde-dev-scripts-4.11.90/createtarball/config.ini 2013-10-22 12:19:48.000000000 +0200 @@ -234,7 +234,7 @@ [kmymoney] gitModule = yes -gitTag = 4.6.2 +gitTag = 4.6.4 mainmodule = branches/stable/extragear-kde4 l10nmodule = extragear-office l10npath = branches/stable @@ -243,7 +243,7 @@ docs = yes docpath = kmymoney/doc translations = yes -version = 4.6.2 +version = 4.6.4 [libalkimia] folder = alkimia diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.11.2/kdedoxyman.sh new/kde-dev-scripts-4.11.90/kdedoxyman.sh --- old/kde-dev-scripts-4.11.2/kdedoxyman.sh 2013-08-28 19:14:02.000000000 +0200 +++ new/kde-dev-scripts-4.11.90/kdedoxyman.sh 2013-10-22 12:19:48.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # # kdedoxyman.sh -# Copyright 2007,2010,2012 by Allen Winter <[email protected]> +# Copyright 2007,2010,2012-2013 by Allen Winter <[email protected]> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,13 +25,17 @@ # ulimit -c unlimited -usage="`basename $0` -d <dir>" +usage="`basename $0` [-d <install_dir>] [-n <project_name>] [-x <project_version>]" -install_dir=""; -while getopts ":d:" options; do +install_dir="$PWD" +project_name="KDE" +project_version="4.12" +while getopts "hn:x:d:" options; do case $options in + h ) echo $usage; exit 0;; d ) install_dir=$OPTARG;; - h ) echo $usage;; + n ) project_name="$OPTARG";; + x ) project_version="$OPTARG";; \? ) echo $usage exit 1;; * ) echo $usage @@ -54,8 +58,8 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = KDE -PROJECT_NUMBER = 4.11 +PROJECT_NAME = $project_name +PROJECT_NUMBER = $project_version OUTPUT_DIRECTORY = $install_dir CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English @@ -150,7 +154,8 @@ *unload.* \ */test/* \ */tests/* \ - *_p.cpp + *_p.cpp \ + */build-*/* EXAMPLE_PATH = EXAMPLE_PATTERNS = * EXAMPLE_RECURSIVE = NO diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.11.2/kdedoxyqt.sh new/kde-dev-scripts-4.11.90/kdedoxyqt.sh --- old/kde-dev-scripts-4.11.2/kdedoxyqt.sh 2013-08-28 19:14:02.000000000 +0200 +++ new/kde-dev-scripts-4.11.90/kdedoxyqt.sh 2013-10-22 12:19:48.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # # kdedoxyqt.sh -# Copyright 2008,2010,2012 by Allen Winter <[email protected]> +# Copyright 2008,2010,2012-2013 by Allen Winter <[email protected]> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,13 +27,15 @@ exit 1 fi -usage="`basename $0` [-n <project_name>] [-x <project_version>]" +usage="`basename $0` [-d <install_dir>] [-n <project_name>] [-x <project_version>]" +install_dir="$PWD" project_name="KDE" -project_version="4.11" -while getopts "hn:x:" options; do +project_version="4.12" +while getopts "hn:x:d:" options; do case $options in h ) echo $usage; exit 0;; + d ) install_dir=$OPTARG;; n ) project_name="$OPTARG";; x ) project_version="$OPTARG";; \? ) echo $usage @@ -44,6 +46,16 @@ esac done +# compute the default output directory, if necessary +if ( test "$install_dir" = "" ) then + echo "must specify the installation directory with the -d option. Exiting..." + exit 1 +fi +if ( test ! -w "$install_dir" ) then + echo "sorry, you do not have write access to the specified installation directory. Exiting..." + exit 1 +fi + virtual_folder="$project_name"-"$project_version" ( cat <<EOF ) | doxygen - @@ -52,7 +64,7 @@ #--------------------------------------------------------------------------- PROJECT_NAME = $project_name PROJECT_NUMBER = $project_version -OUTPUT_DIRECTORY = apidocs +OUTPUT_DIRECTORY = $install_dir/apidocs CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English BRIEF_MEMBER_DESC = YES @@ -112,6 +124,7 @@ ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = YES +SHOW_DIRECTORIES = NO FILE_VERSION_FILTER = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages @@ -146,7 +159,8 @@ *unload.* \ */test/* \ */tests/* \ - *_p.cpp + *_p.cpp \ + */build-*/* EXAMPLE_PATH = EXAMPLE_PATTERNS = * EXAMPLE_RECURSIVE = NO @@ -158,7 +172,7 @@ # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- ALPHABETICAL_INDEX = NO -COLS_IN_ALPHA_INDEX = 1 +COLS_IN_ALPHA_INDEX = 5 IGNORE_PREFIX = #--------------------------------------------------------------------------- # do NOT generate any formats other than qhp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.11.2/reviewboard-am new/kde-dev-scripts-4.11.90/reviewboard-am --- old/kde-dev-scripts-4.11.2/reviewboard-am 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-4.11.90/reviewboard-am 2013-10-22 12:19:48.000000000 +0200 @@ -0,0 +1,181 @@ +#!/usr/bin/env python +# encoding: utf-8 + +""" +Copyright 2013 Aurélien Gâteau <[email protected]> + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation are those +of the authors and should not be interpreted as representing official policies, +either expressed or implied, of the copyright holders. +""" + +from __future__ import print_function + +import sys +if sys.version_info[0] != 2: + print("ERROR: This script must be run with Python 2", file=sys.stderr) + sys.exit(1) + +import json +import os +import subprocess +import urllib2 + +from argparse import ArgumentParser + +RB_URL = "https://git.reviewboard.kde.org"; + +DEBUG_JSON = "DEBUG_JSON" in os.environ + + +def api_request(url): + if DEBUG_JSON: + print("DEBUG_JSON: Fetching", url) + fl = urllib2.urlopen(url) + dct = json.load(fl) + if DEBUG_JSON: + print("DEBUG_JSON:") + print(json.dumps(dct, sort_keys=True, indent=4)) + return dct + + +def git(*args): + cmd = ["git"] + list(args) + print("Running '%s'" % " ".join(cmd)) + return subprocess.call(cmd) == 0 + + +class RBClientError(Exception): + pass + + +class RBClient(object): + def __init__(self, url): + self.url = url + + def get_request_info(self, request_id): + try: + dct = api_request(self.url + "/api/review-requests/%d/" % request_id) + except urllib2.HTTPError, exc: + if exc.code == 404: + raise RBClientError("HTTP Error 404: there is probably no request with id %d." % request_id) + raise + + return dct["review_request"] + + def get_author_info(self, submitter_url): + dct = api_request(submitter_url) + return dct["user"] + + def download_diff(self, request_id): + fl = urllib2.urlopen(self.url + "/r/%d/diff/raw/" % request_id) + return fl.read() + + +def parse_author_info(author_info): + def loop_raw_input(prompt): + while True: + out = raw_input(prompt) + if out: + return out + print("Invalid value.") + + fullname = author_info.get("fullname") + email = author_info.get("email") + username = author_info["username"] + if fullname is None: + fullname = loop_raw_input("Could not get fullname for user '%s'. Please enter it: " % username) + if email is None: + email = loop_raw_input("Could not get email for user '%s'. Please enter it: " % username) + return fullname, email + + +def write_patch(fl, fullname, email, summary, description, diff): + author = "%s <%s>" % (fullname, email) + print("From:", author.encode("utf-8"), file=fl) + print("Subject:", summary.encode("utf-8"), file=fl) + print(file=fl) + print(description.encode("utf-8"), file=fl) + print(file=fl) + fl.write(diff) + + +def detect_p_value(diff): + for line in diff.splitlines(): + if line.startswith("diff --git a/"): + return 1 + elif line.startswith("diff --git "): + return 0 + return 1 + + +def main(): + parser = ArgumentParser() + parser.add_argument("request_id", type=int, + help="reviewboard ID to apply") + parser.add_argument("-b", "--branch", + action="store_true", dest="branch", default=False, + help="create a branch named after the reviewboard ID") + args = parser.parse_args() + + request_id = args.request_id + + rb = RBClient(RB_URL) + + print("Fetching request info") + try: + request_info = rb.get_request_info(request_id) + except RBClientError, exc: + print(exc) + return 1 + author_info = rb.get_author_info(request_info["links"]["submitter"]["href"]) + summary = request_info["summary"] + description = request_info["description"] + description += "\n\nREVIEW: " + str(request_id) + for bug_closed in request_info["bugs_closed"]: + description += "\nBUG: " + bug_closed + fullname, email = parse_author_info(author_info) + + print("Downloading diff") + diff = rb.download_diff(request_id) + + name = "rb-%d.patch" % request_id + print("Creating %s" % name) + with open(name, "w") as fl: + write_patch(fl, fullname, email, summary, description, diff) + + if args.branch: + if not git("checkout", "-b", "rb-%d" % request_id): + return 1 + + p_value = detect_p_value(diff) + + if not git("am", "-p%d" % p_value, name): + return 1 + + return 0 + +if __name__ == "__main__": + sys.exit(main()) +# vi: ts=4 sw=4 et -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
