Control: tags 965799 + patch
Control: tags 965799 + pending

Dear maintainer,

I've prepared an NMU for rasqal (versioned as 0.9.33-0.3) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru rasqal-0.9.33/debian/changelog rasqal-0.9.33/debian/changelog
--- rasqal-0.9.33/debian/changelog      2021-09-18 13:40:08.000000000 -0400
+++ rasqal-0.9.33/debian/changelog      2022-05-03 21:34:08.000000000 -0400
@@ -1,7 +1,27 @@
+rasqal (0.9.33-0.3) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * debian/: Bump debhelper compat to v13. (Closes: #965799)
+  * debian/control:
+    + Bump Standards-Version to 4.6.0.
+    + Add Vcs-* fields.
+    + Migrate from manual -dbg package to automatic -dbgsym package.
+  * debian/changelog: Drop trailing spaces.
+  * debian/control: Drop trailing spaces.
+  * debian/rules:
+    + Convert to dh sequencer.
+    + Build documentation from source code instead of using pre-built
+      doc/html.
+    + Enable full hardening.
+  * debian/copyright: Use secure URI.
+  * debian/watch: Update to v4 format.
+
+ -- Boyuan Yang <by...@debian.org>  Tue, 03 May 2022 21:34:08 -0400
+
 rasqal (0.9.33-0.2) unstable; urgency=high
 
   * Non-maintainer upload.
-  * Add missing build-dependency gtk-doc-tools. (Closes: #978895) 
+  * Add missing build-dependency gtk-doc-tools. (Closes: #978895)
 
  -- Boyuan Yang <by...@debian.org>  Sat, 18 Sep 2021 13:40:08 -0400
 
diff -Nru rasqal-0.9.33/debian/compat rasqal-0.9.33/debian/compat
--- rasqal-0.9.33/debian/compat 2021-09-18 13:38:35.000000000 -0400
+++ rasqal-0.9.33/debian/compat 1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-5
diff -Nru rasqal-0.9.33/debian/control rasqal-0.9.33/debian/control
--- rasqal-0.9.33/debian/control        2021-09-18 13:40:05.000000000 -0400
+++ rasqal-0.9.33/debian/control        2022-05-03 21:34:08.000000000 -0400
@@ -2,9 +2,11 @@
 Section: devel
 Priority: optional
 Maintainer: Dave Beckett <daj...@debian.org>
-Build-Depends: debhelper (>> 8.1.3), cdbs (>= 0.4.93~), dh-autoreconf, pkg-
config, libraptor2-dev (>=2.0.12-2), libgmp-dev, libmhash-dev, libpcre3-dev,
uuid-dev, gtk-doc-tools
-Standards-Version: 3.9.5
+Build-Depends: debhelper-compat (= 13), pkg-config, libraptor2-dev (>=2.0.12-
2), libgmp-dev, libmhash-dev, libpcre3-dev, uuid-dev, gtk-doc-tools
+Standards-Version: 4.6.0
 Homepage: http://librdf.org/rasqal/
+Vcs-Git: https://salsa.debian.org/debian/rasqal.git
+Vcs-Browser: https://salsa.debian.org/debian/rasqal
 
 Package: librasqal3-dev
 Provides: librasqal-dev
@@ -30,7 +32,7 @@
  Rasqal is a C library providing support for querying the
  Resource Description Framework (RDF) including
  parsing query syntaxes, constructing the queries, executing them,
- returning result bindings and formatting results.  It supports the 
+ returning result bindings and formatting results.  It supports the
  SPARQL RDF Query Language, RDF Data Query Language (RDQL) and LAQRS
  experimental query language extending SPARQL.
  .
@@ -43,19 +45,10 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: raptor2-utils, redland-utils
 Description: Rasqal RDF Query utilities
- This package provides the roqet tool for querying RDF content 
+ This package provides the roqet tool for querying RDF content
  with SPARQL and RDQL RDF query languages using the Rasqal RDF
  query library.
 
-Package: librasqal3-dbg
-Priority: extra
-Section: debug
-Architecture: any
-Depends: ${misc:Depends}, librasqal3 (= ${binary:Version})
-Description: Rasqal RDF Query Library - debugging symbols
- This package contains the debugging symbols for debugging
- applications which use librasqal3.
-
 Package: librasqal3-doc
 Section: doc
 Architecture: all
@@ -64,7 +57,7 @@
  Rasqal is a C library providing support for querying the
  Resource Description Framework (RDF) including
  parsing query syntaxes, constructing the queries, executing them,
- returning result bindings and formatting results.  It supports the 
+ returning result bindings and formatting results.  It supports the
  SPARQL RDF Query Language, RDF Data Query Language (RDQL) and LAQRS
  experimental query language extending SPARQL.
  .
diff -Nru rasqal-0.9.33/debian/copyright rasqal-0.9.33/debian/copyright
--- rasqal-0.9.33/debian/copyright      2021-09-18 13:38:35.000000000 -0400
+++ rasqal-0.9.33/debian/copyright      2022-05-03 21:33:08.000000000 -0400
@@ -1,7 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Rasqal RDF Query Library
 Upstream-Contact: Dave Beckett <d...@dajobe.org>
-Source: http://download.librdf.org/source/
+Source: https://download.librdf.org/source/
 
 Files: *
 Copyright: 2000-2014 David Beckett
diff -Nru rasqal-0.9.33/debian/librasqal3-dev.docs rasqal-
0.9.33/debian/librasqal3-dev.docs
--- rasqal-0.9.33/debian/librasqal3-dev.docs    1969-12-31 19:00:00.000000000
-0500
+++ rasqal-0.9.33/debian/librasqal3-dev.docs    2022-05-03 21:20:25.000000000
-0400
@@ -0,0 +1,4 @@
+README
+NEWS
+AUTHORS
+NOTICE
diff -Nru rasqal-0.9.33/debian/librasqal3-dev.install rasqal-
0.9.33/debian/librasqal3-dev.install
--- rasqal-0.9.33/debian/librasqal3-dev.install 2021-09-18 13:38:35.000000000
-0400
+++ rasqal-0.9.33/debian/librasqal3-dev.install 2022-05-03 21:28:54.000000000
-0400
@@ -1,6 +1,7 @@
 debian/tmp/usr/include/rasqal/*.h
 debian/tmp/usr/lib/*/librasqal.a
-debian/tmp/usr/lib/*/librasqal.la
 debian/tmp/usr/lib/*/librasqal.so
 debian/tmp/usr/lib/*/pkgconfig/rasqal.pc
 debian/tmp/usr/bin/rasqal-config
+usr/share/man/man1/rasqal-config.1
+usr/share/man/man3/librasqal.3
diff -Nru rasqal-0.9.33/debian/librasqal3-doc.install rasqal-
0.9.33/debian/librasqal3-doc.install
--- rasqal-0.9.33/debian/librasqal3-doc.install 2021-09-18 13:38:35.000000000
-0400
+++ rasqal-0.9.33/debian/librasqal3-doc.install 2022-05-03 21:30:28.000000000
-0400
@@ -1 +1 @@
-docs/html/* /usr/share/gtk-doc/html/rasqal
+usr/share/gtk-doc/html/rasqal/
diff -Nru rasqal-0.9.33/debian/librasqal3.docs rasqal-
0.9.33/debian/librasqal3.docs
--- rasqal-0.9.33/debian/librasqal3.docs        1969-12-31 19:00:00.000000000
-0500
+++ rasqal-0.9.33/debian/librasqal3.docs        2022-05-03 21:21:02.000000000
-0400
@@ -0,0 +1,4 @@
+README
+NEWS
+AUTHORS
+NOTICE
diff -Nru rasqal-0.9.33/debian/not-installed rasqal-0.9.33/debian/not-
installed
--- rasqal-0.9.33/debian/not-installed  1969-12-31 19:00:00.000000000 -0500
+++ rasqal-0.9.33/debian/not-installed  2022-05-03 21:23:29.000000000 -0400
@@ -0,0 +1 @@
+usr/lib/*/*.la
diff -Nru rasqal-0.9.33/debian/rasqal-utils.docs rasqal-0.9.33/debian/rasqal-
utils.docs
--- rasqal-0.9.33/debian/rasqal-utils.docs      1969-12-31 19:00:00.000000000
-0500
+++ rasqal-0.9.33/debian/rasqal-utils.docs      2022-05-03 21:20:39.000000000
-0400
@@ -0,0 +1,4 @@
+README
+NEWS
+AUTHORS
+NOTICE
diff -Nru rasqal-0.9.33/debian/rasqal-utils.install rasqal-
0.9.33/debian/rasqal-utils.install
--- rasqal-0.9.33/debian/rasqal-utils.install   2021-09-18 13:38:35.000000000
-0400
+++ rasqal-0.9.33/debian/rasqal-utils.install   2022-05-03 21:29:10.000000000
-0400
@@ -1 +1,2 @@
 debian/tmp/usr/bin/roqet
+usr/share/man/man1/roqet.1
diff -Nru rasqal-0.9.33/debian/rules rasqal-0.9.33/debian/rules
--- rasqal-0.9.33/debian/rules  2021-09-18 13:38:35.000000000 -0400
+++ rasqal-0.9.33/debian/rules  2022-05-03 21:25:04.000000000 -0400
@@ -1,39 +1,26 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+export DEB_LDFLAGS_MAINT_APPEND =
+
+%:
+       dh $@
+
+override_dh_auto_configure:
+       dh_auto_configure -- \
+            --with-regex-library=pcre \
+               --with-decimal=gmp \
+               --with-uuid-library=libuuid \
+               --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
-# Replace default CDBS cleanbuilddir rule; has to be before/after definition
-cleanbuilddir::
-       # raw clean calls distclean deletes the docs/html documentation
-       if test -r Makefile; then \
-         mv docs/html docs/html.saved; \
-       fi
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/class/makefile.mk
-
-cleanbuilddir::
-       if test -e docs/html.saved; then \
-         mv docs/html.saved docs/html; \
-       fi
-
-DEB_INSTALL_DOCS_ALL=README NEWS AUTHORS NOTICE
-
-DEB_INSTALL_MANPAGES_librasqal3-dev=src/rasqal-config.1 docs/librasqal.3
-DEB_INSTALL_MANPAGES_rasqal-utils=utils/roqet.1
-DEB_SHLIBDEPS_INCLUDE=debian/librasqal3/usr/lib
-
-DEB_CONFIGURE_EXTRA_FLAGS := \
---with-regex-library=pcre --with-decimal=gmp --with-uuid-library=libuuid \
---libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
-
-DEB_DBG_PACKAGE_librasqal3 = librasqal3-dbg
-
-# do this or autoreconf calling libtoolize destroys the build/ directory
contents
-LIBTOOLIZE=libtoolize --automake --ltdl
-
-# Show what dh_autoreconf is deleting / moving / restoring
-DEB_DH_AUTORECONF_ARGS := --verbose
-
-install/librasqal3-dev::
-        cd debian/tmp/usr/lib/* && sed "/dependency_libs/ s/'.*'/''/"
librasqal.la > librasqal.la.new && mv librasqal.la.new librasqal.la
+override_dh_strip:
+       dh_strip --dbgsym-migration='librasqal3-dbg (<< 0.9.33-0.3~)'
diff -Nru rasqal-0.9.33/debian/watch rasqal-0.9.33/debian/watch
--- rasqal-0.9.33/debian/watch  2021-09-18 13:38:35.000000000 -0400
+++ rasqal-0.9.33/debian/watch  2022-05-03 21:34:00.000000000 -0400
@@ -1,2 +1,2 @@
-version=2
-http://download.librdf.org/source/ rasqal-([\d+\.]+|\d+)\.tar\.gz debian
uupdate
+version=4
+https://download.librdf.org/source/ rasqal-([\d+\.]+|\d+)\.tar\.gz debian
uupdate

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to