Hello,
I'm doing an NMU of xcal to fix #362907 and #377445; diff attached.
Thanks,
Matej
diff -u xcal-4.1/debian/changelog xcal-4.1/debian/changelog
--- xcal-4.1/debian/changelog
+++ xcal-4.1/debian/changelog
@@ -1,3 +1,11 @@
+xcal (4.1-18.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Migrate from /usr/X11R6 to /usr. Closes: #362907, #377445.
+ * xcal_cal/xcal_cal.man: Fix section for dh_installman.
+
+ -- Matej Vela <[EMAIL PROTECTED]> Sun, 16 Jul 2006 10:37:15 +0200
+
xcal (4.1-18.2) unstable; urgency=high
* Non-maintainer upload.
diff -u xcal-4.1/debian/menu xcal-4.1/debian/menu
--- xcal-4.1/debian/menu
+++ xcal-4.1/debian/menu
@@ -2 +2 @@
- title="xcal" command="/usr/X11R6/bin/xcal"
+ title="xcal" command="/usr/bin/xcal"
diff -u xcal-4.1/debian/rules xcal-4.1/debian/rules
--- xcal-4.1/debian/rules
+++ xcal-4.1/debian/rules
@@ -44,22 +44,14 @@
# Add here commands to install the package into debian/xcal.
#$(MAKE) install DESTDIR=`pwd`/debian/xcal
- install xcal debian/xcal/usr/X11R6/bin/xcal
- install xcalpr/xcalpr debian/xcal/usr/X11R6/bin/xcalpr
- install xcalev/xcalev debian/xcal/usr/X11R6/bin/xcalev
- install xcal_cal/xcal_cal debian/xcal/usr/X11R6/bin/xcal_cal
- install pscal/pscal.script debian/xcal/usr/X11R6/bin/pscal
+ install -D xcal debian/xcal/usr/bin/xcal
+ install -D xcalpr/xcalpr debian/xcal/usr/bin/xcalpr
+ install -D xcalev/xcalev debian/xcal/usr/bin/xcalev
+ install -D xcal_cal/xcal_cal debian/xcal/usr/bin/xcal_cal
+ install -D pscal/pscal.script debian/xcal/usr/bin/pscal
# install the app-defaults
- cp -p XCal.ad debian/xcal/etc/X11/app-defaults/XCal
-
- # install the manpages by hand
- # (since they have a .man extension, which dh_installmanpages ignores)
- install xcal.man debian/xcal/usr/X11R6/man/man1/xcal.1
- install pscal/pscal.man debian/xcal/usr/X11R6/man/man1/pscal.1
- install xcal_cal/xcal_cal.man debian/xcal/usr/X11R6/man/man1/xcal_cal.1
- install xcalev/xcalev.man debian/xcal/usr/X11R6/man/man1/xcalev.1
- install xcalpr/xcalpr.man debian/xcal/usr/X11R6/man/man1/xcalpr.1
+ install -D -p -m 644 XCal.ad debian/xcal/etc/X11/app-defaults/XCal
touch install-stamp
@@ -73,7 +65,7 @@
dh_testroot
dh_installdocs
dh_installmenu
- dh_installmanpages
+ dh_installman
dh_installchangelogs CHANGES
dh_link
only in patch2:
unchanged:
--- xcal-4.1.orig/xcal_cal/xcal_cal.man
+++ xcal-4.1/xcal_cal/xcal_cal.man
@@ -1,4 +1,4 @@
-.TH XCAL_CAL (1)
+.TH XCAL_CAL 1
.SH NAME
xcal_cal \- interface to calendar(1) for xcal
.SH SYNOPSIS
only in patch2:
unchanged:
--- xcal-4.1.orig/debian/manpages
+++ xcal-4.1/debian/manpages
@@ -0,0 +1,5 @@
+xcal.man
+pscal/pscal.man
+xcal_cal/xcal_cal.man
+xcalev/xcalev.man
+xcalpr/xcalpr.man
reverted:
--- xcal-4.1/debian/dirs
+++ xcal-4.1.orig/debian/dirs
@@ -1,3 +0,0 @@
-etc/X11/app-defaults
-usr/X11R6/bin
-usr/X11R6/man/man1
