diff options
| -rw-r--r-- | debian/changelog | 22 | ||||
| -rw-r--r-- | debian/control | 7 | ||||
| -rw-r--r-- | debian/copyright | 99 | ||||
| -rw-r--r-- | debian/missing-sources/jquery.treeview.js | 255 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rw-r--r-- | debian/patches/user_guide.patch | 38 | ||||
| -rw-r--r-- | debian/source/options | 2 | ||||
| -rw-r--r-- | debian/watch | 3 |
8 files changed, 357 insertions, 71 deletions
diff --git a/debian/changelog b/debian/changelog index 1b24853..5a259bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,23 @@ -scons-doc (2.3.2-1) UNRELEASED; urgency=medium +scons-doc (2.3.3-1) unstable; urgency=low - * New Maintainer (Closes: #) + * New Maintainer (Closes: #755497). * New upstream release - - -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 26 Jul 2014 09:45:00 +0200 + - Refresh debian/patches/user_guide.patch for new release + * debian/control: + - Set myself as maintainer. + - In Build-Depends and Suggests: + + Change release of scons to (>= 2.3.3). + * debian/copyright: + - Rewrite into machine-readable format. + - Change license for debian/* from GPL to GPL-3.0+. + - Add myself to the list of authors for debian/*. + - Update copyright years for 2014. + * debian/watch + - Rewrite regex for finding all file extensions. + * Add debian/source/options: + - Set compression to xz & compression-level to 9 to save space. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 15 Sep 2014 20:43:56 +0200 scons-doc (2.3.1-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 7faabd3..1b74927 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,10 @@ Source: scons-doc Section: doc Priority: optional -Maintainer: Luca Falavigna <dktrkranz@debian.org> -Uploaders: Mark Brown <broonie@debian.org> +Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net> Build-Depends: debhelper (>= 9), - scons (>= 2.3.1) + scons (>= 2.3) Build-Depends-Indep: docbook-utils, docbook-xml, @@ -21,7 +20,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/scons-doc.git;a=su Package: scons-doc Architecture: all Depends: ${misc:Depends} -Suggests: scons (>= 2.3.1) +Suggests: scons (>= 2.3) Description: Documentation for SCons, a replacement for Make SCons is a make replacement providing a range of enhanced features such as automated dependency generation and built in compilation cache diff --git a/debian/copyright b/debian/copyright index 8882d15..d869e5f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,43 +1,56 @@ -This package was debianized by Luca Falavigna <dktrkranz@ubuntu.com> on -Sat, 27 Dec 2008 11:33:28 +0100. - -It was downloaded from http://scons.tigris.org/svn/scons - -Upstream Author: - - Steven Knight <knight@baldmt.com> - -Copyright: - - Copyright © 2001-2009 The SCons Foundation - Copyright © 1999-2001 Steve Purcell - Copyright © 1999-2006 Gregory P. Ward. - Copyright © 2001-2003 Steven Knight - Copyright © 2001-2004 Twisted Matrix Laboratories - Copyright © 2002-2006 Python Software Foundation. - Copyright © 2003-2005 Peter Astrand - Copyright © 2003 Stichting NLnet Labs - -License: - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY - KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE - WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -The Debian packaging is copyright 2008-2011, Luca Falavigna <dktrkranz@debian.org> -and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: scons-doc +Upstream-Contact: Steven Knight <knight@baldmt.com> +Source: http://www.scons.org + +Files: * +Copyright: 2001-2014 The SCons Foundation + 1999-2006 Gregory P. Ward. + 2001-2003 Steven Knight + 2001-2004 Twisted Matrix Laboratories + 2002-2006 Python Software Foundation. + 2003-2005 Peter Astrand + 2003 Stichting NLnet Labs +License: Expat + +Files: debian/* +Copyright: 2008-2011 Luca Falavigna <dktrkranz@debian.org> + 2014 Jörg Frings-Fürst <debian@jff-webhosting.net> +License: GPL-3.0+ + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +License: GPL-3.0+ + 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 + the Free Software Foundation, either version 3 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 + 3 can be found in "/usr/share/common-licenses/GPL-3". diff --git a/debian/missing-sources/jquery.treeview.js b/debian/missing-sources/jquery.treeview.js new file mode 100644 index 0000000..248e725 --- /dev/null +++ b/debian/missing-sources/jquery.treeview.js @@ -0,0 +1,255 @@ +/* + * Treeview 1.4 - jQuery plugin to hide and show branches of a tree + * + * http://bassistance.de/jquery-plugins/jquery-plugin-treeview/ + * http://docs.jquery.com/Plugins/Treeview + * + * Copyright (c) 2007 Jörn Zaefferer + * + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + * Revision: $Id: jquery.treeview.js 4684 2008-02-07 19:08:06Z joern.zaefferer $ + * + */ + +;(function($) { + + $.extend($.fn, { + swapClass: function(c1, c2) { + var c1Elements = this.filter('.' + c1); + this.filter('.' + c2).removeClass(c2).addClass(c1); + c1Elements.removeClass(c1).addClass(c2); + return this; + }, + replaceClass: function(c1, c2) { + return this.filter('.' + c1).removeClass(c1).addClass(c2).end(); + }, + hoverClass: function(className) { + className = className || "hover"; + return this.hover(function() { + $(this).addClass(className); + }, function() { + $(this).removeClass(className); + }); + }, + heightToggle: function(animated, callback) { + animated ? + this.animate({ height: "toggle" }, animated, callback) : + this.each(function(){ + jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ](); + if(callback) + callback.apply(this, arguments); + }); + }, + heightHide: function(animated, callback) { + if (animated) { + this.animate({ height: "hide" }, animated, callback); + } else { + this.hide(); + if (callback) + this.each(callback); + } + }, + prepareBranches: function(settings) { + if (!settings.prerendered) { + // mark last tree items + this.filter(":last-child:not(ul)").addClass(CLASSES.last); + // collapse whole tree, or only those marked as closed, anyway except those marked as open + this.filter((settings.collapsed ? "" : "." + CLASSES.closed) + ":not(." + CLASSES.open + ")").find(">ul").hide(); + } + // return all items with sublists + return this.filter(":has(>ul)"); + }, + applyClasses: function(settings, toggler) { + this.filter(":has(>ul):not(:has(>a))").find(">span").click(function(event) { + toggler.apply($(this).next()); + }).add( $("a", this) ).hoverClass(); + + if (!settings.prerendered) { + // handle closed ones first + this.filter(":has(>ul:hidden)") + .addClass(CLASSES.expandable) + .replaceClass(CLASSES.last, CLASSES.lastExpandable); + + // handle open ones + this.not(":has(>ul:hidden)") + .addClass(CLASSES.collapsable) + .replaceClass(CLASSES.last, CLASSES.lastCollapsable); + + // create hitarea + this.prepend("<div class=\"" + CLASSES.hitarea + "\"/>").find("div." + CLASSES.hitarea).each(function() { + var classes = ""; + $.each($(this).parent().attr("class").split(" "), function() { + classes += this + "-hitarea "; + }); + $(this).addClass( classes ); + }); + } + + // apply event to hitarea + this.find("div." + CLASSES.hitarea).click( toggler ); + }, + treeview: function(settings) { + + if(typeof(window.treeCookieId) !== 'undefined' || window.treeCookieId === ""){ + treeCookieId = "treeview"; + } + + settings = $.extend({ + cookieId: treeCookieId + }, settings); + + if (settings.add) { + return this.trigger("add", [settings.add]); + } + + if ( settings.toggle ) { + var callback = settings.toggle; + settings.toggle = function() { + return callback.apply($(this).parent()[0], arguments); + }; + } + + // factory for treecontroller + function treeController(tree, control) { + // factory for click handlers + function handler(filter) { + return function() { + // reuse toggle event handler, applying the elements to toggle + // start searching for all hitareas + toggler.apply( $("div." + CLASSES.hitarea, tree).filter(function() { + // for plain toggle, no filter is provided, otherwise we need to check the parent element + return filter ? $(this).parent("." + filter).length : true; + }) ); + return false; + }; + } + // click on first element to collapse tree + $("a:eq(0)", control).click( handler(CLASSES.collapsable) ); + // click on second to expand tree + $("a:eq(1)", control).click( handler(CLASSES.expandable) ); + // click on third to toggle tree + $("a:eq(2)", control).click( handler() ); + } + + // handle toggle event + function toggler() { + $(this) + .parent() + // swap classes for hitarea + .find(">.hitarea") + .swapClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea ) + .swapClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea ) + .end() + // swap classes for parent li + .swapClass( CLASSES.collapsable, CLASSES.expandable ) + .swapClass( CLASSES.lastCollapsable, CLASSES.lastExpandable ) + // find child lists + .find( ">ul" ) + // toggle them + .heightToggle( settings.animated, settings.toggle ); + if ( settings.unique ) { + $(this).parent() + .siblings() + // swap classes for hitarea + .find(">.hitarea") + .replaceClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea ) + .replaceClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea ) + .end() + .replaceClass( CLASSES.collapsable, CLASSES.expandable ) + .replaceClass( CLASSES.lastCollapsable, CLASSES.lastExpandable ) + .find( ">ul" ) + .heightHide( settings.animated, settings.toggle ); + } + } + //Cookie Persistence + function serialize() { + function binary(arg) { + return arg ? 1 : 0; + } + var data = []; + branches.each(function(i, e) { + data[i] = $(e).is(":has(>ul:visible)") ? 1 : 0; + }); + $.cookie(settings.cookieId, data.join("") ); + } + + function deserialize() { + var stored = $.cookie(settings.cookieId); + if ( stored ) { + var data = stored.split(""); + branches.each(function(i, e) { + $(e).find(">ul")[ parseInt(data[i]) ? "show" : "hide" ](); + }); + } + } + + // add treeview class to activate styles + this.addClass("treeview"); + + // prepare branches and find all tree items with child lists + var branches = this.find("li").prepareBranches(settings); + + switch(settings.persist) { + case "cookie": + var toggleCallback = settings.toggle; + settings.toggle = function() { + serialize(); + if (toggleCallback) { + toggleCallback.apply(this, arguments); + } + }; + deserialize(); + break; + case "location": + var current = this.find("a").filter(function() { return this.href.toLowerCase() == location.href.toLowerCase(); }); + if ( current.length ) { + current.addClass("selected").parents("ul, li").add( current.next() ).show(); + } + break; + } + + branches.applyClasses(settings, toggler); + + // if control option is set, create the treecontroller and show it + if ( settings.control ) { + treeController(this, settings.control); + $(settings.control).show(); + } + + return this.bind("add", function(event, branches) { + $(branches).prev() + .removeClass(CLASSES.last) + .removeClass(CLASSES.lastCollapsable) + .removeClass(CLASSES.lastExpandable) + .find(">.hitarea") + .removeClass(CLASSES.lastCollapsableHitarea) + .removeClass(CLASSES.lastExpandableHitarea); + $(branches).find("li").andSelf().prepareBranches(settings).applyClasses(settings, toggler); + }); + } + }); + + // classes used by the plugin + // need to be styled via external stylesheet, see first example + var CLASSES = $.fn.treeview.classes = { + open: "open", + closed: "closed", + expandable: "expandable", + expandableHitarea: "expandable-hitarea", + lastExpandableHitarea: "lastExpandable-hitarea", + collapsable: "collapsable", + collapsableHitarea: "collapsable-hitarea", + lastCollapsableHitarea: "lastCollapsable-hitarea", + lastCollapsable: "lastCollapsable", + lastExpandable: "lastExpandable", + last: "last", + hitarea: "hitarea" + }; + + // provide backwards compability + $.fn.Treeview = $.fn.treeview; + +})(jQuery);
\ No newline at end of file diff --git a/debian/patches/series b/debian/patches/series index 046129f..8914f1d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -#user_guide.patch +user_guide.patch diff --git a/debian/patches/user_guide.patch b/debian/patches/user_guide.patch index f2e143f..b6adcdd 100644 --- a/debian/patches/user_guide.patch +++ b/debian/patches/user_guide.patch @@ -1,24 +1,26 @@ Description: Build User Guide only Author: Luca Falavigna <dktrkranz@debian.org> Forwarded: not-needed - -Index: scons-doc/doc/SConscript +Last-Update: 2014-07-26 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/doc/SConscript =================================================================== ---- scons-doc.orig/doc/SConscript 2014-04-27 11:39:43.567063643 +0200 -+++ scons-doc/doc/SConscript 2014-04-27 11:39:59.097875647 +0200 -@@ -195,12 +195,12 @@ - # of the outputs get installed to the build folder and added to - # the different source and binary packages in the end. - # -- docs = {'design' : ['chtml','pdf'], -+ docs = {#'design' : ['chtml','pdf'], - #'python10' : ['chtml','html','pdf'], -- 'reference' : ['chtml','html','pdf'], -+ #'reference' : ['chtml','html','pdf'], - #'developer' : ['chtml','html','pdf'], - 'user' : ['chtml','html','pdf','epub'], -- 'man' : ['man','epub'] -+ #'man' : ['man','epub'] +--- trunk.orig/doc/SConscript 2014-07-05 15:44:22.000000000 +0200 ++++ trunk/doc/SConscript 2014-07-26 14:00:34.514151395 +0200 +@@ -266,12 +266,12 @@ + DOCTARGETS = 0 + DOCDEPENDS = 1 + DOCNODES = 2 +- docs = {'design' : (['chunked','pdf'], [], []), ++ docs = {#'design' : (['chunked','pdf'], [], []), + #'python10' : (['chunked','html','pdf'], [], []), +- 'reference' : (['chunked','html','pdf'], [], []), ++ #'reference' : (['chunked','html','pdf'], [], []), + #'developer' : (['chunked','html','pdf'], [], []), + 'user' : (['chunked','html','pdf','epub','text'], [], []), +- 'man' : (['man','epub','text'], [], []) ++ #'man' : (['man','epub','text'], [], []) } + # The names of the target files for the MAN pages - man_page_list = ['scons.1','scons-time.1','sconsign.1'] diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..22a4de9 --- /dev/null +++ b/debian/source/options @@ -0,0 +1,2 @@ +compression = xz +compression-level = 9 diff --git a/debian/watch b/debian/watch index 4a3f16b..e4ea395 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=3 -http://sf.net/scons/scons-([0-9.]+)\.tar\.gz +#http://sf.net/scons/scons-([0-9.]+)\.tar\.gz +http://sf.net/scons/scons-src-(\d\S*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) |