tags 552769 + patch pending
thanks
Dear maintainer,
I've prepared an NMU for leptonlib (versioned as 1.62-1.1) and uploaded
it to DELAYED/2, according to devref §5.11.1. The main patch is as
posted to this bug log by Jonathan Niehof, but manpage management is
done via dh_link, instead of duplicating the very same manpage several
times (both in the patch and on user machines).
Regards.
--
Stefano Zacchiroli -o- PhD in Computer Science \ PostDoc @ Univ. Paris 7
z...@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
Dietro un grande uomo c'è ..| . |. Et ne m'en veux pas si je te tutoie
sempre uno zaino ...........| ..: |.... Je dis tu à tous ceux que j'aime
diff -u leptonlib-1.62/debian/leptonica-progs.dir leptonlib-1.62/debian/leptonica-progs.dir
--- leptonlib-1.62/debian/leptonica-progs.dir
+++ leptonlib-1.62/debian/leptonica-progs.dir
@@ -1 +1 @@
-usr/bin/leptonica
+usr/bin
diff -u leptonlib-1.62/debian/leptonica-progs.install leptonlib-1.62/debian/leptonica-progs.install
--- leptonlib-1.62/debian/leptonica-progs.install
+++ leptonlib-1.62/debian/leptonica-progs.install
@@ -1 +1 @@
-usr/bin/leptonica/*
+usr/bin/*
diff -u leptonlib-1.62/debian/rules leptonlib-1.62/debian/rules
--- leptonlib-1.62/debian/rules
+++ leptonlib-1.62/debian/rules
@@ -65,7 +65,7 @@
dh_installdocs
dh_installexamples
dh_install --sourcedir=debian/tmp
- dh_installman -p leptonica-progs debian/*.1
+ dh_installman -p leptonica-progs debian/*.1 debian/leptonica.3
dh_link
dh_strip
dh_compress
diff -u leptonlib-1.62/debian/changelog leptonlib-1.62/debian/changelog
--- leptonlib-1.62/debian/changelog
+++ leptonlib-1.62/debian/changelog
@@ -1,3 +1,13 @@
+leptonlib (1.62-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Move programs out of /usr/bin/leptonica subdirectory, patch by
+ Jonathan Niehof. (Closes: #552769)
+ * debian/rules: install leptonica.3 manpage in leptonica-progs
+ * leptonica-progs.links: link leptonica-progs manpages to leptonica.3
+
+ -- Stefano Zacchiroli <[email protected]> Fri, 04 Dec 2009 16:22:14 +0100
+
leptonlib (1.62-1) unstable; urgency=low
* New upstream release
diff -u leptonlib-1.62/prog/makefile leptonlib-1.62/prog/makefile
--- leptonlib-1.62/prog/makefile
+++ leptonlib-1.62/prog/makefile
@@ -747,9 +747,9 @@
###########################################################
install:
- mkdir -p $(DESTDIR)/usr/bin/leptonica
+ mkdir -p $(DESTDIR)/usr/bin
-@ for file in $(SRC:%.c=%) ; do \
- install $$file $(DESTDIR)/usr/bin/leptonica; \
+ install $$file $(DESTDIR)/usr/bin; \
done ;
###########################################################
only in patch2:
unchanged:
--- leptonlib-1.62.orig/debian/leptonica-progs.links
+++ leptonlib-1.62/debian/leptonica-progs.links
@@ -0,0 +1,27 @@
+usr/share/man/man3/leptonica.3 usr/share/man/man1/binarize_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/binmorph1_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/binmorph2_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/binmorph3_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/binmorph4_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/binmorph5_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/blend_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/conncomp_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/convertsegfilestops.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/enhance_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/expand_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/fpix_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/grayfill_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/hardlight_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/locminmax_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/lowaccess_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/numa_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/pixalloc_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/pixmem_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/rotate1_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/rotate2_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/selio_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/shear_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/smallpix_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/splitcomp_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/warper_reg.1
+usr/share/man/man3/leptonica.3 usr/share/man/man1/xtractprotos.1