Bug#672654: new version
* Alessandro Ghedini <al3xbio@gmail.com> [120906 23:08]:
> I had a look at your package and it mostly looks good, altough I have a few
> remarks:
Thanks for your time.
> debian/control:
> * is there any reason for the Priority: extra? If not it would be better to
> change it to optional.
No particular reason but a mistake. You're right, I changed it to
optional (except for the debug package).
> * you are using git and alioth, which is good, but the alioth repository is
> placed under your home which is not that good. You may want to join the
> collab-maint group [0] or alternatively the Debian Multimedia Team and
> maintain this package under its umbrella (which would provide additional
> people to help you maintain/upload your package). If you are interested
> please read [1] and let me know your alioth username (or send a request to
> join yourself).
It seems a good idea to join the pkg-multimedia team. My other
packages gmpc and gmpc-plugins might be suitable for the team too. My
alioth username is emillon-guest ; please let me know when I can
migrate the repository.
> debian/copyright:
> * in the GPL-3+ text, before the last paragraph, there is an additional dot
> that should be removed.
I removed the extra "empty" line.
> debian/rules:
> * as per #641051 there is no out-of-the-box multi-arch support for cmake in
> debhelper, but I have noticed that glyr's CMakeLists.txt uses the
> INSTALL_LIB_DIR to set that library installation path. Could you please make
> use of it to set a multi-arch enabled installation path and then add the
> relevant d/control fields [2]?
>
> The implementation would look something like this (not tested):
>
> override_dh_auto_configure:
> dh_auto_configure -- -DINSTALL_LIB_DIR=lib/$(DEB_BUILD_MULTIARCH)
>
> (see also dpkg-architecture(1))
I did this. The recipe in [2] was perfect :)t
> [2] http://wiki.debian.org/Multiarch/Implementation
> I have also noticed that some form of API documentation is provided (via
> gtk-doc or similar) but it is not built, any reason?
Built and registered under devhelp and doc-base !
> There may be other stuff that I didn't notice, but that's all for now.
Thanks again for your review.
I pushed & reuploaded the package, it is still available at the same
URL :
http://mentors.debian.net/debian/pool/main/g/glyr/glyr_1.0.0-1.dsc
(debdiff to previous version attached for your convenience)
--
Etienne Millon
diff --git a/debian/changelog b/debian/changelog
index eb57b4f..be9d7de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,4 +3,4 @@ glyr (1.0.0-1) unstable; urgency=low
* Initial release (Closes: #651416).
* Add a patch to set correct build flags (-O2 -g)
- -- Etienne Millon <etienne.millon@gmail.com> Wed, 22 Aug 2012 14:11:34 +0200
+ -- Etienne Millon <etienne.millon@gmail.com> Fri, 07 Sep 2012 17:02:22 +0200
diff --git a/debian/control b/debian/control
index 8b7c72e..bc6130b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,15 @@
Source: glyr
-Priority: extra
-Maintainer: Etienne Millon <etienne.millon@gmail.com>
+Priority: optional
+Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
+Uploaders: Etienne Millon <etienne.millon@gmail.com>
Build-Depends:
cmake,
debhelper (>= 9),
+ gtk-doc-tools,
libcurl4-gnutls-dev | libcurl-dev,
libglib2.0-dev,
- libsqlite3-dev
+ libsqlite3-dev,
+ ruby
Standards-Version: 3.9.3
Section: libs
Homepage: http://github.com/sahib/glyr
@@ -15,6 +18,9 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/emillon-guest/glyr.git
Package: libglyr1
Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends}
@@ -27,6 +33,7 @@ Description: search engine for music-related metadata
Package: libglyr1-dbg
Section: debug
+Priority: extra
Architecture: any
Depends:
libglyr1 (= ${binary:Version}),
diff --git a/debian/copyright b/debian/copyright
index 771a782..a2e5389 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,6 +24,5 @@ License: GPL-3+
You should have received a copy of the GNU General Public License
along with glyr. If not, see <http://www.gnu.org/licenses/>.
.
- .
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/debian/libglyr-dev.doc-base b/debian/libglyr-dev.doc-base
new file mode 100644
index 0000000..c0cba55
--- /dev/null
+++ b/debian/libglyr-dev.doc-base
@@ -0,0 +1,10 @@
+Document: glyr
+Title: libglyr API documentation
+Author: Christopher Pahl
+Abstract: This is the API documentation for libglyr, a search engine library for
+ music metadata. It can also be browsed using devhelp.
+Section: Programming
+
+Format: html
+Index: /usr/share/doc/libglyr-dev/html/index.html
+Files: /usr/share/doc/libglyr-dev/html/*
diff --git a/debian/libglyr-dev.docs b/debian/libglyr-dev.docs
new file mode 100644
index 0000000..615f9df
--- /dev/null
+++ b/debian/libglyr-dev.docs
@@ -0,0 +1 @@
+doc/doc/html/
diff --git a/debian/libglyr-dev.install b/debian/libglyr-dev.install
index ee64dcd..54efcf8 100644
--- a/debian/libglyr-dev.install
+++ b/debian/libglyr-dev.install
@@ -1,3 +1,3 @@
usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/libglyr.pc
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/libglyr.pc
diff --git a/debian/libglyr-dev.links b/debian/libglyr-dev.links
new file mode 100644
index 0000000..df8baa4
--- /dev/null
+++ b/debian/libglyr-dev.links
@@ -0,0 +1 @@
+usr/share/doc/libglyr-dev/html usr/share/gtk-doc/html/libglyr
diff --git a/debian/libglyr1.install b/debian/libglyr1.install
index d0dbfd1..3ddde58 100644
--- a/debian/libglyr1.install
+++ b/debian/libglyr1.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 611effe..0a403a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,13 @@
#!/usr/bin/make -f
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
%:
dh $@
+override_dh_auto_configure:
+ dh_auto_configure -- -DINSTALL_LIB_DIR=lib/$(DEB_BUILD_MULTIARCH)
+
override_dh_compress:
dh_compress -Xasync_queue.c -Xexample.c
@@ -13,3 +17,7 @@ override_dh_fixperms:
override_dh_strip:
dh_strip --dbg-package=libglyr1-dbg
+
+override_dh_installdocs:
+ cd doc ; ruby build_doc.rb
+ dh_installdocs
Reply to: