On Thu, Jun 23, 2016 at 05:26:12PM +0800, Di-Shi Sun wrote: > Sorry for the delay. We just fixed the upload issues on mentors.debian.net. > You can find it at https://mentors.debian.net/package/osptoolkit > > There are several thing about the warning messages on mentors.debian.net > 1. no-upstream-changelog. The upstream source package includes RELNOTES.txt > for its changes. I am not sure if we must put all the change info into > debian/changelog.
https://www.debian.org/doc/debian-policy/ch-docs.html#s-changelogs There is a dh_installchangelog utility, you should use it to install RELNOTES.txt *but* that file clearly has not been updated in a long time, so it's probably more harmful than anything to ship it, so ignore that message. > 3. A watch file is present but doesn't work. We tested the watch file on our > boxes. I do not know why mentors.debian.net thought it does not work. Because mentors.d.n runs on wheezy, and there uscan is not newer enough to work with version=4 files. > BTW, we did not see any of these warning when we run lintian on our boxes. Depends on level of "pendicness" you ask lintian. > Please let us know if there is anything should be modified. I'd like to ask you a few things, following newer best practise in debian packaging: * drop the -dbg package: nowdays debhelper automatically builds -dbgsym packages (though they are not installed in the main debian archive, but in a separate "debug archive") https://wiki.debian.org/AutomaticDebugPackages * try dropping all the debian/*dirs files: they are usually useless, as debhelper tools take care of creating needed directories before installing files; is my personal belief that if you need such files thare are good chances your build system is buggy. I tried and it fails to build, so I suggest you to put on your todo to make your build system more clever and create the needed directories. * d/patches/test_app.c.patch: I can't think why that would be 'Forwarded: not-needed', why can't you apply that upstream? * please rename d/docs to d/osptoolkit.docs: d/docs is a very confusing file name because it makes you think that it install the docs in all produced binaries, while instead it only install them in the first package list in d/control... (I had a lot of people thinking it wrong, so I now advocate for renaming) * versioned -dev packages usually bring only pain during transitions, as they require source changes to all reverse-dependency to change build-depends. I appreciate that you don't have this problem as you don't have reverse-depends, but I wonder if you can take this occasion to rename the -dev package to just 'libosptk-dev'. BTW, in both cases you should add a Conflicts: against the old -dev package, as both ship the same files, and so can't be installed toghether (I prefer a Conflicts (or Conflicts+Replace) in this occasion, rather than a Breaks+Replaces, since you should prefer the removal of the old binary before installing this). See https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts (and ยง7.6). * do you think you can close #555877 too? * in d/rules: + that `ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))`... is not needed: with a new enough dpkg and if you obeys dpkg-buildflags (which you do) is obsolete + can you convert your d/rules to use the dh sequencer instead? + please just remove the .la file. I'm sure it's not used inside debian. Do you instead have any use for it? (as a OS developer I dislike static libraries by a great deal) * d/*.install: they are all useless: thanks to that different sequence of `make install` in d/rules files are already installed in their final location, so dh_install (the program that reads those files) has nothing to do. So, they can go away. I appreciate that's quite some list of things, so I've done some of them, attached a debdiff. Please ping me as soon as you have an updated package, following my suggestions :) -- regards, Mattia Rizzolo GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`. more about me: https://mapreri.org : :' : Launchpad user: https://launchpad.net/~mapreri `. `'` Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diff -Nru osptoolkit-4.11.3/debian/changelog osptoolkit-4.11.3/debian/changelog
--- osptoolkit-4.11.3/debian/changelog 2016-06-23 08:19:33.000000000 +0000
+++ osptoolkit-4.11.3/debian/changelog 2016-06-23 10:42:57.000000000 +0000
@@ -1,3 +1,13 @@
+osptoolkit (4.11.3-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Remove -dbg package, nowadays we have automatic -dbgsym.
+ * Convert d/rules to use the dh(1) sequencer.
+ * Rename versioned -dev package to unversioned one.
+ * Remove .la file.
+
+ -- Mattia Rizzolo <mat...@debian.org> Thu, 23 Jun 2016 10:28:32 +0000
+
osptoolkit (4.11.3-1) unstable; urgency=medium
* Update for upstream OSP Toolkit 4.11.3 (Closes: #786975, #804623)
diff -Nru osptoolkit-4.11.3/debian/control osptoolkit-4.11.3/debian/control
--- osptoolkit-4.11.3/debian/control 2016-06-23 08:32:02.000000000 +0000
+++ osptoolkit-4.11.3/debian/control 2016-06-23 10:40:18.000000000 +0000
@@ -38,10 +38,11 @@
libosptk run-time shared library needed by OSP client end applications that
use OSP Toolkit.
-Package: libosptk4-dev
+Package: libosptk-dev
Architecture: any
Section: libdevel
Depends: libosptk4 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libosptk3-dev
Description: OSP Toolkit development library and header files
The Open Settlement Protocol (OSP) standard defined by the European
Telecommunications Standards Institute (ETSI TS 101 321) www.etsi.org.
@@ -52,19 +53,3 @@
.
libosptk development library and header files for building OSP client end
applications with OSP Toolkit.
-
-Package: libosptk4-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: libosptk4 (= ${binary:Version}), ${misc:Depends}
-Description: OSP Toolkit symbol tables
- The Open Settlement Protocol (OSP) standard defined by the European
- Telecommunications Standards Institute (ETSI TS 101 321) www.etsi.org.
- .
- The OSP Toolkit is an open source implementation of the OSP peering protocol
- and is freely available from www.sourceforge.net. It enables applications for
- secure multi-lateral peering.
- .
- libosptk debug symbol tables for debugging OSP client end applications that
- use OSP Toolkit.
diff -Nru osptoolkit-4.11.3/debian/libosptk4-dev.install
osptoolkit-4.11.3/debian/libosptk4-dev.install
--- osptoolkit-4.11.3/debian/libosptk4-dev.install 2016-06-09
13:04:07.000000000 +0000
+++ osptoolkit-4.11.3/debian/libosptk4-dev.install 1970-01-01
00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-usr/include/osp/*.h
-usr/lib/libosptk.so
-usr/lib/libosptk.a
-usr/lib/libosptk.la
-usr/lib/pkgconfig/libosptk*.pc
diff -Nru osptoolkit-4.11.3/debian/libosptk4.install
osptoolkit-4.11.3/debian/libosptk4.install
--- osptoolkit-4.11.3/debian/libosptk4.install 2016-06-09 13:04:14.000000000
+0000
+++ osptoolkit-4.11.3/debian/libosptk4.install 1970-01-01 00:00:00.000000000
+0000
@@ -1 +0,0 @@
-usr/lib/libosptk.so.*
diff -Nru osptoolkit-4.11.3/debian/osptoolkit.install
osptoolkit-4.11.3/debian/osptoolkit.install
--- osptoolkit-4.11.3/debian/osptoolkit.install 2016-06-09 13:04:34.000000000
+0000
+++ osptoolkit-4.11.3/debian/osptoolkit.install 1970-01-01 00:00:00.000000000
+0000
@@ -1,3 +0,0 @@
-usr/lib/osp/*
-etc/osp/*
-usr/bin/osp*
diff -Nru osptoolkit-4.11.3/debian/rules osptoolkit-4.11.3/debian/rules
--- osptoolkit-4.11.3/debian/rules 2016-06-12 14:19:10.000000000 +0000
+++ osptoolkit-4.11.3/debian/rules 2016-06-23 10:42:03.000000000 +0000
@@ -1,70 +1,26 @@
#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#export DH_VERBOSE = 1
-# see FEATURE AREAS in dpkg-buildflags(1)
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+export DH_VERBOSE = 1
-# 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 = -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-# shared library versions, option 1
version=4.11.3
major=4
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- addflags = -O0
-else
- addflags = -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
-
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: configure-stamp
- dh_testdir
- # Add here commands to compile the package.
+%:
+ dh $@ --parallel
+
+override_dh_auto_build:
$(MAKE) build VERSION="$(version)" MAJOR="$(major)"
ADDFLAGS="$(addflags)"
$(MAKE) enroll VERSION="$(version)" MAJOR="$(major)"
ADDFLAGS="$(addflags)"
$(MAKE) test VERSION="$(version)" MAJOR="$(major)"
ADDFLAGS="$(addflags)"
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
+override_dh_auto_clean:
$(MAKE) VERSION="$(version)" MAJOR="$(major)" clean
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs -A
+override_dh_auto_install:
+ # Add here commands to install the package into debian/osptoolkit
+ $(MAKE) VERSION="$(version)" MAJOR="$(major)"
DESTDIR=$(CURDIR)/debian/osptoolkit install-bin
# Add here commands to install the package into debian/libosptk
$(MAKE) VERSION="$(version)" MAJOR="$(major)"
DESTDIR=$(CURDIR)/debian/libosptk$(major) install-lib
@@ -72,46 +28,4 @@
# Add here commands to install the package into debian/libosptk-dev
$(MAKE) VERSION="$(version)" MAJOR="$(major)"
DESTDIR=$(CURDIR)/debian/libosptk$(major)-dev install-dev
- find $(CURDIR)/debian/libosptk$(major)-dev -name "*.la" -exec \
- sed -i -e "s,^dependency_libs=.*,dependency_libs=''," {} +
-
- # Add here commands to install the package into debian/osptoolkit
- $(MAKE) VERSION="$(version)" MAJOR="$(major)"
DESTDIR=$(CURDIR)/debian/osptoolkit install-bin
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip --dbg-package=libosptk$(major)-dbg
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+ find $(CURDIR)/debian/libosptk$(major)-dev -name "*.la" -print0 | xargs
-0 -r rm -v
signature.asc
Description: PGP signature
