control: retitle -1 Incorrect description in debian/copyright
thanks
Hi,
Here are the patches to get linian clean as possible package for new
upstream source. Yes, I am not using fossil to make this. I use git.
But, at least, these patches are clear enough for anyone to make updated
VCS data on any VCS system.
I am going to make an NMU soon.
Regards,
Osamu
>From f79535022392a6f4b014d562617bd35740e98c93 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <os...@debian.org>
Date: Sun, 9 Oct 2016 00:28:04 +0900
Subject: [PATCH 1/8] Fix debian/copyright #840122
---
debian/copyright | 260 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 238 insertions(+), 22 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 08144a0..c6b557f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,30 +1,246 @@
-This package was created by Barak A. Pearlmutter <b...@debian.org>
-on Tue Sep 15 07:08:30 EDT 2009, reusing some material of
-Stephan Beal <step...@s11n.net> in debian/makedeb.sh
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: fossil-scm
+Source: http://www.fossil-scm.org/
-Fossil itself is
-Copyright (c) 2007 D. Richard Hipp
+Files: *
+Copyright: 2002-2015 D. Richard Hipp
+ 2008-2013 Stephan Beal
+ 2011 Joe Mistachkin
+ 2010-2013 Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ 2010-2014 Salvatore Sanfilippo <antirez at gmail dot com>
+ 2006-2012 WorkWare Systems <http://workware.net.au/>
+License: BSD-2-Clause
-The cvs2fossil utility, in tools/cvs2fossil/ is
-Copyright (c) 2007 Andreas Kupries.
+Files: autosetup/config.*
+Copyright: 1992-2014 Free Software Foundation, Inc.
+License: GPL-3 with autoconf exception
+ This file 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 program 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/>.
+ .
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a
+ configuration script generated by Autoconf, you may include it under
+ the same distribution terms that you use for the rest of that
+ program. This Exception is an additional permission under section 7
+ of the GNU General Public License, version 3 ("GPLv3").
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ Version 3 can be found in `/usr/share/common-licenses/GPL-3'.
-The file src/rstats.c is also
-Copyright (C) Kevin Kinnell
+Files: compat/tcl-8.6/generic/*
+Copyright: 1987-1994 The Regents of the University of California.
+ 1993-1996 Lucent Technologies.
+ 1994-1998 Sun Microsystems, Inc.
+ 1998-2000 Scriptics Corporation.
+ 2002 Kevin B. Kenny.
+License: TCL
+ This software is copyrighted by the Regents of the University of
+ California, Sun Microsystems, Inc., Scriptics Corporation,
+ and other parties. The following terms apply to all files associated
+ with the software unless explicitly disclaimed in individual files.
+ .
+ The authors hereby grant permission to use, copy, modify, distribute,
+ and license this software and its documentation for any purpose, provided
+ that existing copyright notices are retained in all copies and that this
+ notice is included verbatim in any distributions. No written agreement,
+ license, or royalty fee is required for any of the authorized uses.
+ Modifications to this software may be copyrighted by their authors
+ and need not follow the licensing terms described here, provided that
+ the new terms are clearly indicated on the first page of each file where
+ they apply.
+ .
+ IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+ FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+ DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ .
+ THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
+ IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+ NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+ MODIFICATIONS.
+ .
+ GOVERNMENT USE: If you are acquiring this software on behalf of the
+ U.S. government, the Government shall have only "Restricted Rights"
+ in the software and related documentation as defined in the Federal
+ Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
+ are acquiring the software on behalf of the Department of Defense, the
+ software shall be classified as "Commercial Computer Software" and the
+ Government shall have only "Restricted Rights" as defined in Clause
+ 252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the
+ authors grant the U.S. Government and others acting in its behalf
+ permission to use and distribute the software in accordance with the
+ terms specified in this license.
-The file src/wiki.c is also
-Copyright (C) 2008 Stephan Beal
+Files: compat/zlib/*
+Copyright: 1995-1998 Jean-loup Gailly and Mark Adler
+ 1995-2010 Jean-loup Gailly, Brian Raiter and Gilles Vollant.
+ 1995-2014 Jean-loup Gailly
+ 1995-2013 Mark Adler
+ 1998 Andreas R. Kleinert
+ 1998-1999 Scriptics Corporation.
+ 2003 Chris Anderson <chris...@charm.net>
+ 1998-2010 Gilles Vollant (minizip)
+ 2007-2008 Even Rouault
+ 2009-2010 Mathias Svensson
+ 2004 Xavier Roche
+ 1997 Christian Michelsen Research AS http://www.cmr.no
+ 2015 Chris Drexler
+ 2002-2003 Dmitriy Anisimkov
+ 1998 Bob Dellaca.
+ 2003 Cosmin Truta.
+ 1998-2000 Jacques Nomssi Nzali.
+ 2003 Cosmin Truta.
+ 1996 L. Peter Deutsch
+ 1996 L. Peter Deutsch and Jean-Loup Gailly
+License: Zlib
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
-The original sources for fossil can be downloaded for free from:
+Files: compat/zlib/contrib/dotzlib/DotZLib/*
+Copyright: 2004 Henrik Ravn
+License: BSL-1.0
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ 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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
-http://www.fossil-scm.org/
+# Un-used now
+Files: win/include/dirent.h
+Copyright: 2006-2012 Toni Ronkko
+License: MIT
+ This file is part of dirent. Dirent may be freely distributed
+ under the MIT license. For all details and documentation, see
+ https://github.com/tronkko/dirent
-The "upstream tarball" for the first upload to debian was
-http://www.fossil-scm.org/download/fossil-src-20090921191920.tar.gz
+# Un-used now
+Files: tools/cvs2fossil/*
+Copyright: 2007-2008 Andreas Kupries
+License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License version 2 as published by the Free Software Foundation.
+ .
+ This program 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 library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ .
+ The FSF address in the above text is the old one.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-Fossil is licensed under the terms of the GPLv2 (see
-/usr/share/common-licenses/GPL-2). In addition, permission is granted
-to link Fossil against the OpenSSL project's "OpenSSL" library (or
-with modified versions of that library that use the same license), and
-distribute the linked executables. If you modify Fossil, you may
-extend the exception described in this paragraph to your
-modifications, or not, at your discretion.
+# Un-used now
+Files: compat/zlib/contrib/ada/zlib.ads
+Copyright: 2002-2004 Dmitriy Anisimkov
+License: GPL-2+ with generics exception
+ This library 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 library 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 library; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ .
+ As a special exception, if other files instantiate generics from this
+ unit, or you link this unit with other files to produce an executable,
+ this unit does not by itself cause the resulting executable to be
+ covered by the GNU General Public License. This exception does not
+ however invalidate any other reasons why the executable file might be
+ covered by the GNU Public License.
+ .
+ The FSF address in the above text is the old one.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+# Osamu assumed Barak's work is licensed as the upstream one
+Files: debian/*
+Copyright: 2009-2015 Barak A. Pearlmutter <b...@debian.org>
+ 2016 Osamu Aoki <os...@debian.org>
+License: BSD-2-Clause
+
+License: BSD-2-Clause
+ 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 AUTHORS ``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 AUTHORS 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 contributors and should not be interpreted
+ as representing official policies, either expressed or implied, of anybody
+ else.
--
2.9.3
>From 6462ab817fc97e70c68ab7c4769fa40f9f07d79c Mon Sep 17 00:00:00 2001
From: Osamu Aoki <os...@debian.org>
Date: Sun, 9 Oct 2016 00:16:19 +0900
Subject: [PATCH 2/8] Use upstream manpage
---
debian/README.Debian | 12 ------
debian/fossil.1 | 115 -------------------------------------------------
debian/fossil.manpages | 2 +-
3 files changed, 1 insertion(+), 128 deletions(-)
delete mode 100644 debian/fossil.1
diff --git a/debian/README.Debian b/debian/README.Debian
index d097c59..6433c5a 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -2,18 +2,6 @@ Version taken as
1:$(cat VERSION)
-Man page created by manually editing output of this:
-
- help2man ./fossil \
- --help-option=help --version-option=version \
- --no-info \
- --name='Distributed Version Control System' \
- --source=http://fossil-scm.org \
- | egrep -v '^This is fossil version' \
- | sed s'/^This \\-/Fossil \\-/' \
- | sed s'/ THIS / FOSSIL /' \
- > debian/fossil.1
-
The debianized sources are tracked in fossil, of course.
diff --git a/debian/fossil.1 b/debian/fossil.1
deleted file mode 100644
index 9a1aee6..0000000
--- a/debian/fossil.1
+++ /dev/null
@@ -1,115 +0,0 @@
-.TH FOSSIL "1" "January 2011" "http://fossil-scm.org"; "User Commands"
-.SH NAME
-fossil \- Distributed Version Control System
-.SH SYNOPSIS
-.B fossil
-\fIhelp\fR
-.br
-.B fossil
-\fIhelp COMMAND\fR
-.br
-.B fossil
-\fICOMMAND [OPTIONS]\fR
-.SH DESCRIPTION
-Fossil is a distributed version control system (DVCS) with built-in
-wiki, ticket tracker, CGI/http interface, and http server.
-
-.SH Available COMMANDs:
-
-add co info rename ticket
-.br
-addremove commit init revert timeline
-.br
-all configuration leaves rm ui
-.br
-annotate deconstruct ls scrub undo
-.br
-artifact delete merge search unset
-.br
-bisect descendants mv server update
-.br
-branch diff new settings user
-.br
-cgi export open sha1sum version
-.br
-changes extras pull sqlite3 wiki
-.br
-checkout finfo push stash winsrv
-.br
-ci gdiff rebuild status zip
-.br
-clean help reconstruct sync
-.br
-clone http redo tag
-.br
-close import remote-url tarball
-
-.SH FEATURES
-
-Features as described on the fossil home page.
-
-.HP
-1.
-.B Bug Tracking And Wiki
-- In addition to doing distributed version control like Git and
-Mercurial, Fossil also supports distributed bug tracking, distributed
-wiki, and a distributed blog mechanism all in a single integrated
-package.
-
-.HP
-2.
-.B Web Interface
-- Fossil has a built-in and easy-to-use web interface that simplifies
-project tracking and promotes situational awareness. Simply type
-"fossil ui" from within any check-out and Fossil automatically opens
-your web browser in a page that gives detailed graphical history and
-status information on that project.
-
-.HP
-3.
-.B Autosync
-- Fossil supports "autosync" mode which helps to keep projects moving
-forward by reducing the amount of needless forking and merging often
-associated with distributed projects.
-
-.HP
-4.
-.B Self-Contained
-- Fossil is a single stand-alone executable that contains everything
-needed to do configuration management. Installation is trivial: simply
-download a precompiled binary for Linux, Mac, or Windows and put it on
-your $PATH. Easy-to-compile source code is available for users on
-other platforms. Fossil sources are also mostly self-contained,
-requiring only the "zlib" library and the standard C library to build.
-
-.HP
-5.
-.B Simple Networking
-- Fossil uses plain old HTTP (with proxy support) for all network
-communications, meaning that it works fine from behind restrictive
-firewalls. The protocol is bandwidth efficient to the point that
-Fossil can be used comfortably over a dial-up internet connection.
-
-.HP
-6.
-.B CGI Enabled
-- No server is required to use fossil. But a server does make
-collaboration easier. Fossil supports three different yet simple
-server configurations. The most popular is a 2-line CGI script. This
-is the approach used by the self-hosting fossil repositories.
-
-.HP
-7.
-.B Robust & Reliable
-- Fossil stores content using an enduring file format in an SQLite
-database so that transactions are atomic even if interrupted by a
-power loss or system crash. Furthermore, automatic self-checks verify
-that all aspects of the repository are consistent prior to each
-commit. In over three years of operation, no work has ever been lost
-after having been committed to a Fossil repository.
-
-.SH DOCUMENTATION
-http://www.fossil-scm.org/
-.br
-.B fossil
-\fIui\fR
diff --git a/debian/fossil.manpages b/debian/fossil.manpages
index 50b159c..6987954 100644
--- a/debian/fossil.manpages
+++ b/debian/fossil.manpages
@@ -1 +1 @@
-debian/fossil.1
+fossil.1
--
2.9.3
>From 27d46320b359a4e7ec768afe515681660437ca57 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <os...@debian.org>
Date: Sun, 9 Oct 2016 00:33:11 +0900
Subject: [PATCH 3/8] Update patch for unknown options
Patch enables to continue for unknown options by:
From: "Barak A. Pearlmutter" <b...@debian.org>
Date: Sun, 9 Oct 2016 08:05:52 +0900
Subject: Continue for unknown options
Remove fossil artifacts for easier uupdate
---
.../0001-Continue-for-unknown-options.patch | 42 +++++++
debian/patches/debian-changes | 127 ---------------------
debian/patches/series | 2 +-
3 files changed, 43 insertions(+), 128 deletions(-)
create mode 100644 debian/patches/0001-Continue-for-unknown-options.patch
delete mode 100644 debian/patches/debian-changes
diff --git a/debian/patches/0001-Continue-for-unknown-options.patch b/debian/patches/0001-Continue-for-unknown-options.patch
new file mode 100644
index 0000000..185e61b
--- /dev/null
+++ b/debian/patches/0001-Continue-for-unknown-options.patch
@@ -0,0 +1,42 @@
+From: "Barak A. Pearlmutter" <b...@debian.org>
+Date: Sun, 9 Oct 2016 08:05:52 +0900
+Subject: Continue for unknown options
+
+This is a simplified patch updated by Osamu Aoki to move to
+the new upstream release without using fossil archive for NMU.
+---
+ autosetup/autosetup | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/autosetup/autosetup b/autosetup/autosetup
+index df3317c..d2888cc 100755
+--- a/autosetup/autosetup
++++ b/autosetup/autosetup
+@@ -422,7 +422,7 @@ proc options {optlist} {
+ if {[opt-bool option-checking]} {
+ foreach o [array names ::useropts] {
+ if {$o ni $::autosetup(options)} {
+- user-error "Unknown option --$o"
++ user-warning "Unknown option --$o"
+ }
+ }
+ }
+@@ -759,6 +759,18 @@ proc user-error {msg} {
+ exit 1
+ }
+
++# @user-warning msg
++#
++# Indicate incorrect usage to the user, including if required components
++# or features are not found.
++# autosetup doesn't exit.
++#
++proc user-warning {msg} {
++ show-notices
++ puts stderr "Error: $msg"
++ puts stderr "Try: '[file tail $::autosetup(exe)] --help' for options"
++}
++
+ # @user-notice msg
+ #
+ # Output the given message to stderr.
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
deleted file mode 100644
index 5c95643..0000000
--- a/debian/patches/debian-changes
+++ /dev/null
@@ -1,127 +0,0 @@
-This patch contains all the Debian-specific changes mixed together.
-The reason for doing this, rather than maintaining quilt patches, is
-that the Debian-specific changes are maintained as a branch in a
-fossil repository. To review them separately, please inspect the
-debian branch in http://people.debian.org/~bap/fossil.fsl
---- fossil-1.33.orig/autosetup/autosetup
-+++ fossil-1.33/autosetup/autosetup
-@@ -422,7 +422,7 @@ proc options {optlist} {
- if {[opt-bool option-checking]} {
- foreach o [array names ::useropts] {
- if {$o ni $::autosetup(options)} {
-- user-error "Unknown option --$o"
-+ user-warning "Unknown option --$o"
- }
- }
- }
-@@ -759,6 +759,12 @@ proc user-error {msg} {
- exit 1
- }
-
-+proc user-warning {msg} {
-+ show-notices
-+ puts stderr "Warning: $msg"
-+ puts stderr "Try: '[file tail $::autosetup(exe)] --help' for options"
-+}
-+
- # @user-notice msg
- #
- # Output the given message to stderr.
---- fossil-1.33.orig/manifest
-+++ fossil-1.33/manifest
-@@ -1,5 +1,5 @@
--C Version\s1.33
--D 2015-05-23T11:11:31.970
-+C update\sdebian/changelog
-+D 2015-07-11T23:38:04.565
- F .dockerignore 29c5476ae4fb609219ea3f11d60c4b133a037b68
- F .fossil-settings/clean-glob c1679d70a381afc39909203441036a736fb4b596
- F .fossil-settings/encoding-glob f72f509f8101fb1f252c5719175a300aaabce8e0
-@@ -14,7 +14,7 @@ F Makefile.classic 8860fc8763421cb968e05
- F Makefile.in 4c745f08a8ecfe6e1f227e2a6d33cce3adc532d0
- F VERSION 68b05f0ffffaf08e478922297c5140cc3b5d6965
- F ajax/README 133f25a88f21479a20cc3b20a8dfa0f0fa807ffc
--F ajax/cgi-bin/fossil-json.cgi.example 5e1245c336a0666e3777c5ba46ce2bbcd6450619
-+F ajax/cgi-bin/fossil-json.cgi.example 5e1245c336a0666e3777c5ba46ce2bbcd6450619 x
- F ajax/i-test/rhino-shell.js 2b735676d55e3d06d670ffbc643e5d3f748b95ea
- F ajax/i-test/rhino-test.js 29c5eb998ee1b33f8138f26618ef1014a0555e48
- F ajax/index.html 144dfb6264fd55caf41e9138e94110f846c2d701
-@@ -48,7 +48,7 @@ F art/encode9.tex 84df5abf42b007748ec0ea
- F auto.def e70a82048f77a7f67461cd7a06a287313e066531
- F autosetup/LICENSE 34b2f1d7acba3eeb992e4281307640989cd08d0a
- F autosetup/README.autosetup 4e0b671b54288fc64d851d056822ee5fec4d3365
--F autosetup/autosetup f80eb8d3ebc34b06b08095daf8d964a898ea2777 x
-+F autosetup/autosetup 81cb02c15279da3890a59576594c240fa2f997f1 x
- F autosetup/cc-db.tcl 2789d831c2f4ac5364d6aaf0ea922b5fad382f4d
- F autosetup/cc-lib.tcl 3c6bbfcb75eacfd4d5b060b9da74bfbf6e932305
- F autosetup/cc-shared.tcl 6634fa62ced64692179819ef83eb0ade13f6f7d0
-@@ -60,7 +60,7 @@ F autosetup/find-tclsh f973558ad74bd8e4d
- F autosetup/jimsh0.c c4b6eb336c5fb548e747b1dc50ffc710fc0f7df0
- F autosetup/local.tcl 3a6a7704f546f0863f86f69df7af1858de9c41c9
- F autosetup/system.tcl 9e878fb45e32f6a2790ac82b84f9c9d951e15c68
--F autosetup/test-tclsh f197a4c7bfa8bde7672864fc36dcbc7f85bdda6c x
-+F autosetup/test-tclsh f197a4c7bfa8bde7672864fc36dcbc7f85bdda6c
- F compat/tcl-8.6/generic/tcl.h 3e49f8e5404fd60181c69b6d0ad075e12c4fbd4d
- F compat/tcl-8.6/generic/tclDecls.h 9f431aa5c9a819efa078fadecf3fb1214137455d
- F compat/tcl-8.6/generic/tclPlatDecls.h 05f8965cb99af1c9bb78ff437e991f49a598f7b7
-@@ -306,7 +306,20 @@ F compat/zlib/zlib2ansi e9859eecf47ae662
- F compat/zlib/zutil.c e1af709bff21ae0d4331119a7fc4c19f82932043
- F compat/zlib/zutil.h b909d27ef9ce51639f76b7ea6b62721e7d1b6bf7
- F configure 239cde01aca7fc63a2903f85bd2a6414189f1bd4 x
--F debian/makedeb.sh b57db65590abc4216946cecd9850a94fd3a4b19f
-+F debian/README.Debian 8c466f7a600c1fcf21c6507921a9279a86fb151d
-+F debian/changelog 7104df90329cb028c315f2167570fed406006307
-+F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
-+F debian/control d8ff692f49133213e4f1151806c53c88a298f440
-+F debian/copyright 29b63bf8e972b563d99210f6f37a86d2b1208fe7
-+F debian/fossil.1 0aa94b217a630021c4b7fcf6b4a91dac1511c704
-+F debian/fossil.docs 45a770a8534b1a439a32546145737975a9217b30
-+F debian/fossil.install 8ae909034651ad9b0a72cd10460fed7b9e51f627
-+F debian/fossil.manpages a54d8f1ffdace2473552a7903f51d059edc38a07
-+F debian/rules 7d6814d13a021f24cdb66bf021da9ec585032df7 x
-+F debian/source/format 1064dc0ce263680c076a1005f35ec906a5cf5a32
-+F debian/source/local-options 58a65fc3dfe4bbb8692c99e80334fba1e913f072
-+F debian/source/patch-header 84c8aca673f2fc094c29a10bd519fca36a57e9f6
-+F debian/watch 6761f44df048b7be1ed9ac89d23c31d24c091ec7
- F fossil.1 2947f4d66ede5508f4fbe501e1e965df3b3a243d
- F setup/fossil.iss 57e01e1feb0198de025417c0a98f1d4b1c444f53
- F setup/fossil.nsi 688d5a732b08facc529dceeb9fb1ce5c9aa050ab
-@@ -730,17 +743,13 @@ F www/style.wiki 4c9c67c0eddba030a73a55e
- F www/sync.wiki ecd7e356270a40e81649970c1b606767db68d9e3
- F www/tech_overview.wiki 66d893fd0bca7f5dbc659ab0b4e9dde987e4fdb3
- F www/th1.md bf69f21f480afe640a327cd0d392be77a9a3c1bb
--F www/theory1.wiki ddd2a87bc0849a3da7c2187cb91219bf0941dae0
-+F www/theory1.wiki 2618357f5fdd2f767f177f161827053ac1193f20
- F www/tickets.wiki 717ff5a436834bf0ec42f9501216449c40b938fe
- F www/uitest.html b4160b619cb6694c0caebd13422b15a3182e5dee
- F www/webpage-ex.md 72a7965e3c53ea04beb0bbac5e11757b308b2059
- F www/webui.wiki 7fe551ac712f1036d3927f983e6469962fe4402d
- F www/wikitheory.wiki 06d46f731993c0d0ab1c9b202fea77a6dbd6a7a8
--P 36c457b086ed710f2f8b825e2657ead54b27364f
--R fa566a255d636eaaa4b59169412ce50e
--T +bgcolor * #d0c0ff
--T +sym-release *
--T +sym-version-1.33 *
--U drh
--Z fcd65a9b4e598d39eae8601775b2f8cb
--# Remove this line to create a well-formed manifest.
-+P 2f685e7e3ecabb6b4e39c36274c88392a0590b0f
-+R 3185dda9e0685c069a43b32b98ec3032
-+U barak
-+Z 840d47f63454f01ee979438a655bb0fc
---- fossil-1.33.orig/manifest.uuid
-+++ fossil-1.33/manifest.uuid
-@@ -1 +1 @@
--9c65b5432e4aeecf3556e5550c338ce93fd861cc
-+bd97cb73068243a100517b7465c1f9f8acf8d24f
---- fossil-1.33.orig/www/theory1.wiki
-+++ fossil-1.33/www/theory1.wiki
-@@ -110,7 +110,7 @@ just a programming language.
-
- For certain types of problems, SQL has a huge advantage over other
- programming languages because it is so high level and because it allows
--programmers to focus more on the <i>what</i> and less of the <i>how</i>
-+programmers to focus more on the <i>what</i> and less on the <i>how</i>
- of a computation. In other words,
- programmers tend to think about problems at a much higher level when
- using SQL; this can result in better applications.
diff --git a/debian/patches/series b/debian/patches/series
index 7bb8252..00b0791 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-debian-changes
+0001-Continue-for-unknown-options.patch
--
2.9.3
>From 92bb54c65cb9455f9bbeb956a2c6db8338d6d617 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <os...@debian.org>
Date: Sun, 9 Oct 2016 09:17:29 +0900
Subject: [PATCH 4/8] Fix Vcs-* entries
At least people can see the upstrem source tree with https://
BTS #638475 is left as is
---
debian/control | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 5fe2a4c..e877f39 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,9 @@ Build-depends: debhelper (>= 9),
tcl | tcl8.5 | tclsh,
zlib1g-dev | libz-dev,
libssl-dev
-Vcs-Browser: http://fossil-scm.org
-Homepage: http://fossil-scm.org
+Vcs-Fossil: https://fossil-scm.org
+Vcs-Browser: https://www.fossil-scm.org/index.html/dir
+Homepage: https://fossil-scm.org
Package: fossil
Architecture: any
--
2.9.3
>From 7bda185d5a6f95a2fbe47423e4bea8914bfb2e12 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <os...@debian.org>
Date: Sun, 9 Oct 2016 00:24:55 +0900
Subject: [PATCH 5/8] Update debian/rules for M-A BTS #808069
Patch from Sergei Golovan <sgolo...@nes.ru> with
some minor updates from Osamu Aoki <os...@debian.org>
---
debian/control | 12 +++++++-----
debian/rules | 8 +++++++-
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/debian/control b/debian/control
index e877f39..d4d5c5f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,23 +2,25 @@ Source: fossil
Section: vcs
Priority: optional
Maintainer: Barak A. Pearlmutter <b...@debian.org>
-Standards-Version: 3.9.5
+Standards-Version: 3.9.8
Build-depends: debhelper (>= 9),
autotools-dev,
libreadline-dev,
libfuse-dev,
libsqlite3-dev,
- sqlite3,
- tcl | tcl8.5 | tclsh,
+ tcl-dev,
zlib1g-dev | libz-dev,
- libssl-dev
+ libssl-dev,
+ sqlite3,
+ tcl | tclsh
Vcs-Fossil: https://fossil-scm.org
Vcs-Browser: https://www.fossil-scm.org/index.html/dir
Homepage: https://fossil-scm.org
Package: fossil
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: foreign
+Depends: libtcl8.6 | libtcl, ${shlibs:Depends}, ${misc:Depends}
Suggests: gnupg | gnupg2
Description: DSCM with built-in wiki, http interface and server, tickets database
Fossil is an easy-to-use Distributed Source Control Management system
diff --git a/debian/rules b/debian/rules
index 428bb24..7be2e62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,15 @@
#!/usr/bin/make -f
+
+include /usr/share/dpkg/architecture.mk
+
%:
dh $@ --parallel --with autotools-dev
override_dh_auto_configure:
- dh_auto_configure -- --disable-internal-sqlite --json
+ dh_auto_configure -- --disable-internal-sqlite --json \
+ --with-th1-docs --with-th1-hooks \
+ --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ --with-tcl-stubs
# From src/main.mk:
#
--
2.9.3
>From fc4d987d53839d7cbf18742a9de3435b94694899 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <os...@debian.org>
Date: Sun, 9 Oct 2016 10:53:45 +0900
Subject: [PATCH 6/8] Fix debian/rules irregularities
* Use upstream build and install script
* Install upstream bash completion script
* Stop parrallel build for easier debug
* Hardening
---
debian/fossil.install | 1 -
debian/rules | 10 +++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
delete mode 100644 debian/fossil.install
diff --git a/debian/fossil.install b/debian/fossil.install
deleted file mode 100644
index cecc059..0000000
--- a/debian/fossil.install
+++ /dev/null
@@ -1 +0,0 @@
-fossil usr/bin/
diff --git a/debian/rules b/debian/rules
index 7be2e62..6d4cf37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,11 @@
#!/usr/bin/make -f
+DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_BUILD_MAINT_OPTIONS
include /usr/share/dpkg/architecture.mk
%:
- dh $@ --parallel --with autotools-dev
+ dh $@ --with autotools-dev
override_dh_auto_configure:
dh_auto_configure -- --disable-internal-sqlite --json \
@@ -20,7 +22,13 @@ override_dh_auto_configure:
override_dh_auto_test:
@echo skipping test due to scary warning in src/main.mk
+# Currently, test fails for json. Needs to be investigated.
+
override_dh_auto_install:
+ dh_auto_install
+ mkdir -p debian/fossil/usr/share/bash-completion/completions
+ cp tools/fossil-autocomplete.bash \
+ debian/fossil/usr/share/bash-completion/completions/fossil
override_dh_installdocs:
dh_installdocs
--
2.9.3
>From f1fd9d2eb4c461005f7d9541dcea0eae5d311681 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <os...@debian.org>
Date: Sun, 9 Oct 2016 12:45:53 +0900
Subject: [PATCH 7/8] Update changelog for 1.35
---
debian/changelog | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 0d3e51d..8aa5190 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+fossil (1:1.35-1.1) unstable; urgency=low
+
+ [ Osamu Aoki ]
+ * Non-maintainer upload.
+ * New upstream release
+ * Merge Sergei's patch with Multi-arch: foreign
+ * Use upstream manpage
+ * Update VCS-Browser to show the source tree but leave #638475
+ since usually VCS-* are pointing to Debian packaging tree.
+ * Fix d/copyright (closes: #840122)
+
+ [ Sergei Golovan ]
+ * enable TH1 for embedded documentation pages
+ * enable TH1 hooks for commands and web pages
+ * enable Tcl integration (closes: #808069)
+
+ -- Osamu Aoki <os...@debian.org> Sun, 09 Oct 2016 15:41:58 +0900
+
fossil (1:1.33-3) unstable; urgency=medium
* enable line editing via build dependency on libreadline-dev
--
2.9.3
>From 4cf7e2cc542f2e319a4e703992a7a1317216f3db Mon Sep 17 00:00:00 2001
From: Osamu Aoki <os...@debian.org>
Date: Sun, 9 Oct 2016 18:54:51 +0900
Subject: [PATCH 8/8] control: wrap-and-sort
---
debian/control | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/debian/control b/debian/control
index d4d5c5f..dfac21b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,16 @@ Section: vcs
Priority: optional
Maintainer: Barak A. Pearlmutter <b...@debian.org>
Standards-Version: 3.9.8
-Build-depends: debhelper (>= 9),
- autotools-dev,
- libreadline-dev,
- libfuse-dev,
- libsqlite3-dev,
- tcl-dev,
- zlib1g-dev | libz-dev,
- libssl-dev,
- sqlite3,
- tcl | tclsh
+Build-depends: autotools-dev,
+ debhelper (>= 9),
+ libfuse-dev,
+ libreadline-dev,
+ libsqlite3-dev,
+ libssl-dev,
+ sqlite3,
+ tcl | tclsh,
+ tcl-dev,
+ zlib1g-dev | libz-dev
Vcs-Fossil: https://fossil-scm.org
Vcs-Browser: https://www.fossil-scm.org/index.html/dir
Homepage: https://fossil-scm.org
@@ -20,7 +20,7 @@ Homepage: https://fossil-scm.org
Package: fossil
Architecture: any
Multi-Arch: foreign
-Depends: libtcl8.6 | libtcl, ${shlibs:Depends}, ${misc:Depends}
+Depends: libtcl8.6 | libtcl, ${misc:Depends}, ${shlibs:Depends}
Suggests: gnupg | gnupg2
Description: DSCM with built-in wiki, http interface and server, tickets database
Fossil is an easy-to-use Distributed Source Control Management system
--
2.9.3
