Build Debian source package

.gitignore

@@ -45,4 +45,5 @@ xunit*.xml
 /.env/
 /.pybuild/
 /.pytest_cache/
-/.coverage*
+/.coverage*
+/.vscode

.gitlab-ci.yml

@@ -155,29 +155,25 @@ package:deb:
         BACKPORTS: deb http://deb.debian.org/debian buster-backports main
       - DIST: [bullseye, bookworm]
       - DIST: [jammy, lunar, mantic]
-        TZ: UTC
-  script: |
-    set -x
-    set -e
-    if [ ! -z "$BACKPORTS" ]; then
-      echo "$BACKPORTS" > /etc/apt/sources.list.d/backports.list
-    fi
-    apt update
-    apt -y --no-install-recommends install devscripts lsb-release
-    if [ ! -z "$BACKPORTS" ]; then
-      apt build-dep -t $DIST-backports -y .
-    else
-      apt build-dep -y .
-    fi
-    export DEB_VERSION=$(lsb_release -rs)
-    export APP_VERSION=$(python3 setup.py --version)
-    export VERSION=${APP_VERSION}+deb${DEB_VERSION}
-    export DEBEMAIL=${CI_COMMIT_AUTHOR}
-    dch -v "$VERSION" "Automated build"
-    dpkg-buildpackage -b
-    mkdir -p ./dist/$DIST
-    rm -Rf ./dist/$DIST/*
-    mv ../rdiffweb*.deb ./dist/$DIST/
+  script:
+    # Clean-up
+    - rm -f ../rdiffweb_*
+    - rm -Rf ./dist/$DIST/*
+    # Install dependencies
+    - if [ ! -z "$BACKPORTS" ]; then echo "$BACKPORTS" > /etc/apt/sources.list.d/backports.list; fi
+    - apt update
+    - apt -y --no-install-recommends install devscripts lsb-release
+    - if [ ! -z "$BACKPORTS" ]; then apt build-dep -t $DIST-backports -y . ; else apt build-dep -y .; fi
+    # Generate change log
+    - export DEBEMAIL=${CI_COMMIT_AUTHOR}
+    - debian/rules changelog
+    # Generate orig.tar.gz
+    - debian/rules gentarball
+    # Run build in separate target
+    - debuild -us -uc
+    # Move files to archives
+    - mkdir -p ./dist/$DIST
+    - mv ../rdiffweb_* ./dist/$DIST/
   artifacts:
     paths:
       - ./dist/*
@@ -207,10 +203,8 @@ test-package:deb:
     - curl http://localhost:8080/static/css/font-awesome.min.css
     - curl http://localhost:8080/static/css/jquery.dataTables.min.css
     - curl http://localhost:8080/static/css/responsive.dataTables.min.css
-    - curl http://localhost:8080/static/fonts/FontAwesome.otf
     - curl http://localhost:8080/static/fonts/fontawesome-webfont.eot
     - curl http://localhost:8080/static/fonts/fontawesome-webfont.svg
-    - curl http://localhost:8080/static/fonts/fontawesome-webfont.ttf
     - curl http://localhost:8080/static/fonts/fontawesome-webfont.woff
     - curl http://localhost:8080/static/fonts/fontawesome-webfont.woff2
     - curl http://localhost:8080/static/images/sort_asc.png

debian/changelog

@@ -1,4 +1,4 @@
-rdiffweb (2.1.0-1) unstable; urgency=medium
+rdiffweb (2.8.6-1) unstable; urgency=medium
 
   * Initial upload to debian (Closes: #969974).
 

debian/control

@@ -4,10 +4,11 @@ Priority: optional
 Maintainer: Patrik Dufresne <[email protected]>
 Build-Depends:
  chromium-driver,
- coreutils,
+ coreutils (>= 8.30),
  debhelper-compat (= 13),
  dh-sequence-python3,
- gzip,
+ gzip (>= 1.9),
+ help2man,
  python3,
  python3-all-dev,
  python3-apscheduler,
@@ -45,8 +46,8 @@ Vcs-Browser: https://gitlab.com/ikus-soft/rdiffweb
 Package: rdiffweb
 Architecture: all
 Depends:
- coreutils,
- gzip,
+ coreutils (>= 8.30),
+ gzip (>= 1.9),
  fonts-font-awesome,
  libjs-bootstrap4,
  libjs-chart.js,
@@ -57,6 +58,7 @@ Depends:
  python3-future,
  rdiff-backup,
  ${python3:Depends},
+ ${misc:Depends},
 Suggests:
  python3-psycopg2,
 Description: web interface to rdiff-backup repositories

debian/copyright

@@ -2,39 +2,35 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: rdiffweb
 Upstream-Contact: Patrik Dufresne <[email protected]>
 Source: https://github.com/rdiff-backup/rdiff-backup
+Files-Excluded: extras
+ rdiffweb/static/css/bootstrap.min.css
+ rdiffweb/static/css/bootstrap.min.css.map
+ rdiffweb/static/css/font-awesome.css.map
+ rdiffweb/static/css/font-awesome.min.css
+ rdiffweb/static/css/jquery.dataTables.min.css
+ rdiffweb/static/css/responsive.dataTables.min.css
+ rdiffweb/static/fonts/fontawesome-webfont.eot
+ rdiffweb/static/fonts/fontawesome-webfont.svg
+ rdiffweb/static/fonts/fontawesome-webfont.woff
+ rdiffweb/static/fonts/fontawesome-webfont.woff2
+ rdiffweb/static/images/sort_asc.png
+ rdiffweb/static/images/sort_asc_disabled.png
+ rdiffweb/static/images/sort_both.png
+ rdiffweb/static/images/sort_desc.png
+ rdiffweb/static/images/sort_desc_disabled.png
+ rdiffweb/static/js/bootstrap.bundle.js.map
+ rdiffweb/static/js/bootstrap.bundle.min.js
+ rdiffweb/static/js/chartkick.min.js
+ rdiffweb/static/js/chart.min.js
+ rdiffweb/static/js/dataTables.buttons.min.js
+ rdiffweb/static/js/dataTables.responsive.min.js
+ rdiffweb/static/js/jquery.dataTables.min.js
+ rdiffweb/static/js/jquery.min.js
 
 Files: *
 Copyright: 2019-2021 Patrik Dufresne <[email protected]>
 License: GPL-3+
 
-Files:
- rdiffweb/static/js/bootstrap.*
-Copyright: 2011-2019, Twitter, Inc.
-           2014, jQuery Foundation and other contributors
-           2014, "Cowboy" Ben Alman, contributors
-           HTML5 Boilerplate
-           2011, Nicolas Gallagher <[email protected]>
-           2012, 2013, Tim Kadlec <[email protected]>
-License-Grant:
- Code and documentation copyright 2011-2019 Twitter, Inc.
- Code released under the MIT license
- <https://github.com/twbs/bootstrap/blob/master/LICENSE>.
- Docs released under Creative Commons
- <https://github.com/twbs/bootstrap/blob/master/docs/LICENSE>.
-License: Expat
-
-Files: rdiffweb/static/js/chart.min.js
-Copyright: Copyright (C) 2021 Chart.js Contributors
-License: MIT
-
-Files: rdiffweb/static/js/chartkick.min.js
-Copyright: Copyright (c) 2013-2021 Andrew Kane
-License: MIT
-
-Files: rdiffweb/static/js/jquery.min.js
-Copyright: 2005-2011 John Resig, Brandon Aaron & Jörn Zaefferer
-License: GPL-2 or MIT
-
 License: GPL-3+
  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
@@ -51,79 +47,3 @@ License: GPL-3+
  .
  The full text of the GNU General Public License version 3
  can be found in the file /usr/share/common-licenses/GPL-3.
-
-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: BSD-3-Clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-     * Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-     * 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.
-     * Neither the name of the <organization> nor the
-       names of its contributors may be used to endorse or promote products
-       derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY Michael Bostock ''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 <copyright holder> 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.
-
-License: GPL-2
- On Debian GNU/Linux systems,
- the complete text of the GNU General  Public License
- can be found in </usr/share/common-licenses/GPL-2>.
-
-License: MIT
- Copyright (c) 2011 John Resig, https://jquery.com/
- .
- 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.