[Pkg-wmaker-commits] [wmtime] 23/101: Imported Debian patch 1.0b2-5

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmtime.

commit 953c6d9ae8acccf637ac31b481e41e0cfa12b620
Author: Fredrik Hallenberg <hallon at debian.org>
Date:   Fri Apr 12 17:58:04 2002 +0200

    Imported Debian patch 1.0b2-5
---
 debian/changelog   | 18 +++++++++++++-----
 debian/control     |  2 +-
 debian/dirs        |  3 +--
 debian/rules       |  6 +++---
 debian/wmtime.menu |  2 +-
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a8d0090..a93ae13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+wmtime (1.0b2-5) unstable; urgency=low
+
+  * Forgot to update menu entry with new path (closes: #142461)
+
+ -- Fredrik Hallenberg <hallon at debian.org>  Fri, 12 Apr 2002 17:58:04 +0200
+
+wmtime (1.0b2-4) unstable; urgency=low
+
+  * Install in /usr/bin instead of /usr/X11R6/bin (closes: #122023)
+  * Recompile fixes dependencies (closes: #132386)
+
+ -- Fredrik Hallenberg <hallon at debian.org>  Thu, 11 Apr 2002 18:20:07 +0200
+
 wmtime (1.0b2-3) frozen unstable; urgency=low
 
   * Fixed monthname (NOV instead of NOW).
@@ -17,8 +30,3 @@ wmtime (1.0b2-1) unstable; urgency=low
   * Initial Release.
 
  -- Fredrik Hallenberg <hallon at debian.org>  Wed, 15 Jul 1998 18:18:07 +0200
-
-Local variables:
-mode: debian-changelog
-add-log-mailing-address: "hallon at debian.org"
-End:
diff --git a/debian/control b/debian/control
index 36afc93..fed4081 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: wmtime
 Section: x11
 Priority: optional
 Maintainer: Fredrik Hallenberg <hallon at debian.org>
-Standards-Version: 3.1.1
+Standards-Version: 3.5.6
 Build-Depends: debhelper, libxpm4-dev
 
 Package: wmtime
diff --git a/debian/dirs b/debian/dirs
index 82eb000..e772481 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1 @@
-usr/X11R6/bin
-
+usr/bin
diff --git a/debian/rules b/debian/rules
index e29b3c5..0b66957 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ install-stamp: build-stamp
 	dh_clean -k
 	dh_installdirs
 
-	install -m 755 wmtime/wmtime `pwd`/debian/tmp/usr/X11R6/bin
+	install -m 755 wmtime/wmtime `pwd`/debian/tmp/usr/bin
 
 	touch install-stamp
 
@@ -41,8 +41,8 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installmenu
-	dh_installdocs BUGS HINTS INSTALL README TODO
-	dh_undocumented wmtime.1x
+	dh_installdocs BUGS HINTS README TODO
+	dh_undocumented wmtime.1
 	dh_installchangelogs CHANGES
 	dh_strip
 	dh_compress
diff --git a/debian/wmtime.menu b/debian/wmtime.menu
index a0396d1..e112468 100644
--- a/debian/wmtime.menu
+++ b/debian/wmtime.menu
@@ -2,4 +2,4 @@
   needs=X11\
   section=Apps/Tools hints="Clocks"\
   title="wmtime"\
-  command="/usr/X11R6/bin/wmtime"
+  command="/usr/bin/wmtime"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmtime.git