8 files changed, 80 insertions, 67 deletions
diff --git a/packages/APKBUILD b/packages/APKBUILD
index ac9fda4..29a33e7 100644
--- a/packages/APKBUILD
+++ b/packages/APKBUILD
@@ -1,46 +1,33 @@
-# -*- sh -*-
-
-# Contributor:
-# Maintainer: Sébastien Gross <invalid@invalid.tld>
-
+# Contributor: Ryan Barnett <ryanbarnett3@gmail.com>
+# Maintainer: Ryan Barnett <ryanbarnett3@gmail.com>
 pkgname=squashfs-tools-ng
-pkgver=1.0.4
+pkgver=1.1.2
 pkgrel=0
-pkgdesc="New set of tools for working with SquashFS images."
-url="https://github.com/AgentD/squashfs-tools-ng"
+pkgdesc="A new set of tools and libraries for working with SquashFS images"
+url="https://infraroot.at/projects/squashfs-tools-ng/index.html"
 arch="all"
-license="GPL3"
-depends="squashfs-tools"
-makedepends="autoconf automake libtool m4 make gcc doxygen lzo-dev zstd-dev lz4-dev xz-dev zlib-dev libselinux-dev"
-install=""
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="https://github.com/AgentD/squashfs-tools-ng/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
+license="GPL-3.0-or-later"
+makedepends="automake libselinux-dev lz4-dev lzo-dev xz-dev zlib-dev zstd-dev libbz2-dev"
+subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
+source="https://infraroot.at/pub/squashfs/squashfs-tools-ng-$pkgver.tar.gz"
 
 build() {
-    cd "$builddir"
-    ./autogen.sh
-    ./configure --prefix=/usr
-    make
-    make doxygen-doc
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
 }
 
 check() {
-    cd "$builddir"
-    make check
+	make check
 }
 
 package() {
-    cd "$builddir"
-    make -j1 DESTDIR="$pkgdir" install
-}
-
-doc() {
-    cd "$builddir"
-    pkgdesc="$pkgname documemtation"
-    default_doc
-    install -d "$subpkgdir/usr/share/doc/$pkgname"
-    cp -a doxygen-doc/* "$subpkgdir/usr/share/doc/$pkgname"
-
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3c9f3bea73becaf026bfe22fdc5da28de05d7b5fa7e17230a74f7cc9d08efefda59c004113b6d1aaa59d0e586fc379bc6d0f6e178ddab794bfe9c5966602204c  squashfs-tools-ng-1.0.4.tar.gz"
+sha512sums="3f66cd9034997104e2d3281e271e8ccfbdd6ecaa98313636dcfd5251717e173ceede27b4a94342b011707fc1e96884ec733423f978697c6420915d96c153cf3e  squashfs-tools-ng-1.1.2.tar.gz"
diff --git a/packages/PKGBUILD b/packages/PKGBUILD
index adc9222..3b48dca 100644
--- a/packages/PKGBUILD
+++ b/packages/PKGBUILD
@@ -1,16 +1,19 @@
-# -*- sh -*-
-
-# Maintainer: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
-# Contributor:
+# Maintainer: David Oberhollenzer <goliath at infraroot dot at>
 
 pkgname=('squashfs-tools-ng' 'squashfs-tools-ng-doc')
-pkgver=1.0.4
+pkgver=1.1.2
 pkgrel=1
 epoch=
-pkgdesc="New set of tools for working with SquashFS images."
-url="https://github.com/AgentD/squashfs-tools-ng"
-license=('GPL3')
+pkgdesc='A new set of tools and libraries for working with SquashFS images'
+url='https://infraroot.at/projects/squashfs-tools-ng/index.html'
 arch=('x86_64')
+license=('GPL3' 'LGPL3')
+depends=('lzo' 'lz4' 'xz' 'zstd' 'zlib' 'attr' 'bzip2')
+source=(https://infraroot.at/pub/squashfs/${pkgname}-${pkgver}.tar.xz{,.asc})
+sha512sums=('3f66cd9034997104e2d3281e271e8ccfbdd6ecaa98313636dcfd5251717e173ceede27b4a94342b011707fc1e96884ec733423f978697c6420915d96c153cf3e'
+            'SKIP'
+	   )
+validpgpkeys=('13063F723C9E584AEACD5B9BBCE5DC3C741A02D1')
 groups=()
 makedepends=(
     'fakeroot'
@@ -25,7 +28,6 @@ makedepends=(
     'gcc'
     'doxygen')
 #
-depends=('zstd' 'lzo' 'attr')
 checkdepends=()
 optdepends=('squashfs-tools')
 provides=()
@@ -35,27 +37,14 @@ backup=()
 options=()
 install=
 changelog=
-source=("https://github.com/AgentD/squashfs-tools-ng/archive/v$pkgver/$pkgname-$pkgver.tar.gz")
 noextract=()
 
-## Generated using: makepkg -g PKGBUILD
-md5sums=('6f0a153a3438fa333771759e70d5fd41')
-sha1sums=('8996e3f4560eb99bb536f49aa3d43ef7d74386da')
-sha224sums=('a1abb8bcdc13c497f4be40866c0ac3425018af6e64fb866604614146')
-sha256sums=('addcd60f94971b7f7d7f65a973efa19714d273515a4f4bfc90138b0db0a4c9e9')
-sha384sums=('09adeae3321bbf61d4a40c26297892300da2074fbb83ca49a9002e3ab0d775ab6ea4f4945f075e65d18c32a5979b18a9')
-sha512sums=('3c9f3bea73becaf026bfe22fdc5da28de05d7b5fa7e17230a74f7cc9d08efefda59c004113b6d1aaa59d0e586fc379bc6d0f6e178ddab794bfe9c5966602204c')
-b2sums=('4ad4a36d10580c035b4af7c09ec2d4794fd1a054579d0427971debbb2dbb859b486dfc1d27ac56136d85b78e2e3787f4330917bf1c8c5bca0e1da028add55cf9')
-
-validpgpkeys=()
-
 prepare() {
     cd "$pkgname-$pkgver"
 }
 
 build() {
     cd "$pkgname-$pkgver"
-    ./autogen.sh
     ./configure --prefix=/usr
     make
     make doxygen-doc
@@ -67,7 +56,7 @@ check() {
 }
 
 package_squashfs-tools-ng() {
-    #depends=('zstd' 'attr' 'zlib' 'xz' 'lzo' )
+    #depends=('zstd' 'attr' 'zlib' 'xz' 'lzo' 'bzip2' )
     cd "$pkgname-$pkgver"
     make DESTDIR="$pkgdir/" install
 }
diff --git a/packages/debian/changelog b/packages/debian/changelog
index ff9051d..7ef4d5b 100644
--- a/packages/debian/changelog
+++ b/packages/debian/changelog
@@ -1,3 +1,25 @@
+squashfs-tools-ng (1.1.2-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Sat, 26 Jun 2021 07:35:56 +0200
+
+squashfs-tools-ng (1.1.1-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Sun, 23 May 2021 16:19:32 +0200
+
+squashfs-tools-ng (1.0.4-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Add upstream metadata.
+  * Update packaging bits.
+  * Update debhelper level to 13 .
+  * Update Standards-Version to 4.5.1 .
+
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Fri, 29 Jan 2021 23:20:01 +0100
+
 squashfs-tools-ng (1.0.3-2) unstable; urgency=medium
 
   * Backport upstream fix for normalization of slashes in filenames
diff --git a/packages/debian/control b/packages/debian/control
index fe8f213..9fc9f3b 100644
--- a/packages/debian/control
+++ b/packages/debian/control
@@ -2,8 +2,9 @@ Source: squashfs-tools-ng
 Section: kernel
 Priority: optional
 Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
-Build-Depends: debhelper-compat (= 12), pkg-config, libselinux1-dev [linux-any], liblzma-dev, liblz4-dev, zlib1g-dev, libzstd-dev, liblzo2-dev, doxygen
-Standards-Version: 4.5.0
+Build-Depends: debhelper-compat (= 13), pkg-config, libselinux1-dev [linux-any], liblzma-dev, liblz4-dev, zlib1g-dev, libzstd-dev, liblzo2-dev
+Standards-Version: 4.5.1
+Rules-Requires-Root: no
 Homepage: https://github.com/AgentD/squashfs-tools-ng
 
 Package: squashfs-tools-ng
diff --git a/packages/debian/libsquashfs-dev.install b/packages/debian/libsquashfs-dev.install
index 54979e9..92a5426 100644
--- a/packages/debian/libsquashfs-dev.install
+++ b/packages/debian/libsquashfs-dev.install
@@ -2,4 +2,3 @@ usr/include/
 usr/lib/*/libsquashfs.a
 usr/lib/*/libsquashfs.so
 usr/lib/*/pkgconfig/
-doxygen-doc/* usr/share/doc/libsquashfs-dev
diff --git a/packages/debian/rules b/packages/debian/rules
index adedbc7..ccf7734 100755
--- a/packages/debian/rules
+++ b/packages/debian/rules
@@ -9,10 +9,6 @@ override_dh_auto_install:
 	# remove libtool .la files
 	find $(CURDIR)/debian/tmp/ -name '*.la' -delete
 
-override_dh_auto_build:
-	dh_auto_build
-	$(MAKE) doxygen-doc
-
 %:
 	dh ${@}
 
diff --git a/packages/debian/upstream/metadata b/packages/debian/upstream/metadata
new file mode 100644
index 0000000..d32bd34
--- /dev/null
+++ b/packages/debian/upstream/metadata
@@ -0,0 +1,6 @@
+---
+Archive: GitHub
+Bug-Database: https://github.com/AgentD/squashfs-tools-ng/issues
+Bug-Submit: https://github.com/AgentD/squashfs-tools-ng/issues/new
+Repository: https://github.com/AgentD/squashfs-tools-ng.git
+Repository-Browse: https://github.com/AgentD/squashfs-tools-ng
diff --git a/packages/squashfs-tools-ng.spec b/packages/squashfs-tools-ng.spec
index 00f0d97..c10e847 100644
--- a/packages/squashfs-tools-ng.spec
+++ b/packages/squashfs-tools-ng.spec
@@ -6,7 +6,7 @@
 %endif
 
 Name: squashfs-tools-ng
-Version: 1.0.4
+Version: 1.1.2
 Release: 1%{?dist}
 License: GPLv3+
 URL: https://github.com/AgentD/squashfs-tools-ng
@@ -54,14 +54,17 @@ BuildRequires: zlib-devel
 BuildRequires: xz-devel
 BuildRequires: lzo-devel
 BuildRequires: libattr-devel
+
 # Need to be explicitly declared on Fedora
 BuildRequires: make
 
-# OpenSUSE has a different lz4 devel package name
+# OpenSUSE has a different lz4 and bzip2 devel package names
 %if 0%{?suse_version} > 0
 BuildRequires: liblz4-devel
+BuildRequires: libbz2-devel
 %else
 BuildRequires: lz4-devel
+BuildRequires: bzip2-devel
 %endif
 
 %if 0%{?use_zstd}
@@ -74,9 +77,17 @@ Requires: zlib
 Requires: xz
 Requires: lzo
 Requires: libattr
-Requires: lz4
 Requires: libselinux
 
+# OpenSUSE has a different lz4 and bzip2 package names
+%if 0%{?suse_version} > 0
+Requires: liblz4
+Requires: libbz2
+%else
+BuildRequires: lz4
+BuildRequires: bzip2
+%endif
+
 #Recommends: squashfs-tools
    
 %package        lib
@@ -141,9 +152,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jun 26 2021 David Oberhollenzer <goliath@infraroot.at> - 1.1.2-1
+- Bump to version 1.1.2.
 * Sat Jan 23 2021 David Oberhollenzer <goliath@infraroot.at> - 1.0.4-1
 - Bump to version 1.0.4.
-* Wed Nov 05 2020 David Oberhollenzer <goliath@infraroot.at> - 1.0.3-1
+* Thu Nov 05 2020 David Oberhollenzer <goliath@infraroot.at> - 1.0.3-1
 - Bump to version 1.0.3.
 * Thu Oct 01 2020 Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org> - 1.0.2-1
 - Add Fedora support.