tags 724447 + pending thanks Dear maintainer,
I've prepared an NMU for xosd (versioned as 2.2.14-2.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards. -- Eric Dorland <e...@kuroneko.ca> ICQ: #61138586, Jabber: ho...@jabber.com
diff -Nru xosd-2.2.14/debian/changelog xosd-2.2.14/debian/changelog
--- xosd-2.2.14/debian/changelog 2011-07-26 08:26:52.000000000 -0400
+++ xosd-2.2.14/debian/changelog 2014-02-16 16:40:55.000000000 -0500
@@ -1,3 +1,13 @@
+xosd (2.2.14-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/54_fix_man_makefile.diff: Remove duplicate listing of
+ man pages that break with newer automakes.
+ * debian/control, debian/rules: Switch to dh-autoreconf. (Closes:
+ #724447)
+
+ -- Eric Dorland <e...@debian.org> Sun, 16 Feb 2014 16:40:55 -0500
+
xosd (2.2.14-2) unstable; urgency=low
* Acknowledge NMUs by jmm, sven, luk, sam, porridge: Thanks.
diff -Nru xosd-2.2.14/debian/control xosd-2.2.14/debian/control
--- xosd-2.2.14/debian/control 2011-07-25 13:00:33.000000000 -0400
+++ xosd-2.2.14/debian/control 2014-02-16 16:37:07.000000000 -0500
@@ -2,10 +2,7 @@
Section: x11
Priority: optional
Maintainer: Philipp Matthias Hahn <pmh...@debian.org>
-Build-Depends: libtool,
- autoconf,
- autotools-dev,
- automake1.10,
+Build-Depends: dh-autoreconf,
pkg-config,
debhelper (>= 7.0.50),
libx11-dev,
diff -Nru xosd-2.2.14/debian/patches/54_fix_man_makefile.diff xosd-2.2.14/debian/patches/54_fix_man_makefile.diff
--- xosd-2.2.14/debian/patches/54_fix_man_makefile.diff 1969-12-31 19:00:00.000000000 -0500
+++ xosd-2.2.14/debian/patches/54_fix_man_makefile.diff 2014-02-16 16:37:07.000000000 -0500
@@ -0,0 +1,13 @@
+Index: xosd-2.2.14/man/Makefile.am
+===================================================================
+--- xosd-2.2.14.orig/man/Makefile.am 2004-08-19 18:39:38.000000000 -0400
++++ xosd-2.2.14/man/Makefile.am 2014-02-15 22:56:50.307809900 -0500
+@@ -3,7 +3,7 @@
+ xosd_display.3 xosd_hide.3 xosd_is_onscreen.3 xosd_set_vertical_offset.3 \
+ xosd_set_pos.3 xosd_set_shadow_offset.3 xosd_show.3 xosd_uninit.3 xosd.3 \
+ xosd_get_number_lines.3 xosd_set_align.3 xosd_create.3 \
+- xosd_set_horizontal_offset.3 xosd_destroy.3 xosd_create.3 xosd_is_onscreen.3 \
++ xosd_set_horizontal_offset.3 xosd_destroy.3 \
+ xosd_set_bar_length.3
+
+ EXTRA_DIST = ${man_MANS}
diff -Nru xosd-2.2.14/debian/patches/series xosd-2.2.14/debian/patches/series
--- xosd-2.2.14/debian/patches/series 2011-07-26 08:23:08.000000000 -0400
+++ xosd-2.2.14/debian/patches/series 2014-02-16 16:37:07.000000000 -0500
@@ -3,3 +3,4 @@
30_aclocal.diff
35_beep_media_player.diff
328676.diff
+54_fix_man_makefile.diff
diff -Nru xosd-2.2.14/debian/rules xosd-2.2.14/debian/rules
--- xosd-2.2.14/debian/rules 2011-07-26 08:44:50.000000000 -0400
+++ xosd-2.2.14/debian/rules 2014-02-16 16:37:07.000000000 -0500
@@ -1,21 +1,13 @@
#!/usr/bin/make -f
%:
- dh $*
+ dh $@ --with autoreconf
override_dh_auto_configure:
- autoreconf -fi
dh_auto_configure -- \
--disable-beep_media_player_plugin \
--disable-old-plugin \
--disable-new-plugin
-override_dh_clean:
- dh_clean
- find -name Makefile.in -exec $(RM) {} \;
- $(RM) config.guess config.sub
- $(RM) configure aclocal.m4
- $(RM) depcomp install-sh ltconfig ltmain.sh missing mkinstalldirs INSTALL
-
override_dh_installdocs:
dh_installdocs --all
signature.asc
Description: Digital signature
