[Pkg-wmaker-commits] [wmclock] 21/66: Imported Debian patch 1.0.12.2-8
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 10:52:50 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmclock.
commit 15fc0f2165bb301d98256fb3f97fc176596cd98e
Author: Sandro Tosi <matrixhasu at gmail.com>
Date: Thu Dec 27 19:20:07 2007 +0100
Imported Debian patch 1.0.12.2-8
---
debian/changelog | 18 ++++++++++++++-
debian/control | 4 ++--
debian/copyright | 37 +++++++++++++++++--------------
debian/menu | 2 +-
debian/patches/00list | 1 +
debian/patches/20_fix_manpage_name.dpatch | 20 +++++++++++++++++
debian/rules | 10 ++++-----
7 files changed, 66 insertions(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d99e29c..eb9be46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+wmclock (1.0.12.2-8) unstable; urgency=low
+
+ * debian/control
+ - adding build-dependency (Closes: #450537)
+ - bump Standard-Version to 3.7.3
+ * debian/rules
+ - some little changes
+ * debian/copyright
+ - indented with 4 spaces
+ * debian/menu
+ - updated to new menu policy
+ * debian/patches/20_fix_manpage_name.dpatch
+ - added to fix manpage first line (lintian warning)
+
+ -- Sandro Tosi <matrixhasu at gmail.com> Thu, 27 Dec 2007 19:20:07 +0100
+
wmclock (1.0.12.2-7) unstable; urgency=low
* Adopting package (Closes: #439966)
@@ -44,7 +60,7 @@ wmclock (1.0.12.2-7) unstable; urgency=low
* debian/lang.polish/*
- moved here since they are provided buy Debian maintainer, not upstream
- -- Sandro Tosi <matrixhasu at gmail.com> Wed, 03 Oct 2007 22:54:36 +0200
+ -- Sandro Tosi <matrixhasu at gmail.co> Wed, 19 Dec 2007 22:59:04 +0100
wmclock (1.0.12.2-6) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d63e3d2..e5b6140 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: wmclock
Section: x11
Priority: optional
Maintainer: Sandro Tosi <matrixhasu at gmail.com>
-Build-Depends: debhelper (>= 5), libxpm-dev, libx11-dev, xutils, dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), libxpm-dev, libx11-dev, xutils, dpatch, x11proto-xext-dev, libxt-dev, libxext-dev
+Standards-Version: 3.7.3
Homepage: http://www.jmknoble.net/WindowMaker/wmclock/
Package: wmclock
diff --git a/debian/copyright b/debian/copyright
index dd4d98b..7e6c2f9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,27 +7,30 @@ Is is not maintained by Sandro Tosi <matrixhasu at gmail.com>
It was downloaded from http://www.bensinclair.com/dockapp/ and it is
now available on http://www.jmknoble.net/WindowMaker/wmclock/ .
-Upstream Author: Jim Knoble <jmknoble at pobox.com>
+Upstream Author:
-Copyright: 1999 Jim Knoble <jmknoble at pobox.com>
- Significant portions of wmclock are directly derived from
- asclock by Beat Christen <spiff at longstreet.ch>, who, along
- with asclock's other authors, owns the copyright to those
- portions of wmclock.
+ Jim Knoble <jmknoble at pobox.com>
+
+Copyright:
+
+ 1999 Jim Knoble <jmknoble at pobox.com>
+ Significant portions of wmclock are directly derived from asclock
+ by Beat Christen <spiff at longstreet.ch>, who, along with asclock's
+ other authors, owns the copyright to those portions of wmclock.
License:
- Wmclock is licensed under the GNU General Public License, version
- 2, or (at your option) any later version. See
- <http://www.gnu.org/> for more information.
-
- The software is provided ``as is'', without warranty of any kind,
- express or implied, including but not limited to the warranties of
- merchantability, fitness for a particular purpose and
- noninfringement. In no event shall the author(s) be liable for any
- claim, damages or other liability, whether in an action of
- contract, tort or otherwise, arising from, out of or in connection
- with the software or the use or other dealings in the software.
+ Wmclock is licensed under the GNU General Public License, version
+ 2, or (at your option) any later version. See
+ <http://www.gnu.org/> for more information.
+
+ The software is provided ``as is'', without warranty of any kind,
+ express or implied, including but not limited to the warranties of
+ merchantability, fitness for a particular purpose and
+ noninfringement. In no event shall the author(s) be liable for
+ any claim, damages or other liability, whether in an action of
+ contract, tort or otherwise, arising from, out of or in connection
+ with the software or the use or other dealings in the software.
On Debian GNU/Linux systems, the complete text of the GNU General Public
License, version 2, can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/menu b/debian/menu
index 22b0eb6..ca327ac 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,3 +1,3 @@
?package(wmclock):needs="x11" \
- section="Applications/Tools" hints="Clocks" title="Wmclock" \
+ section="Applications/System/Administration" hints="Clocks" title="Wmclock" \
command="/usr/bin/wmclock"
diff --git a/debian/patches/00list b/debian/patches/00list
index 3e5df3b..31e05ca 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
00-fix_manpage_source_chgs_prior_adoption
00-fix_wmclockc_source_chgs_prior_adoption
10-fix_manpage_lintian_warning
+20_fix_manpage_name
diff --git a/debian/patches/20_fix_manpage_name.dpatch b/debian/patches/20_fix_manpage_name.dpatch
new file mode 100644
index 0000000..93785c3
--- /dev/null
+++ b/debian/patches/20_fix_manpage_name.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_fix_manpage_name.dpatch by Sandro Tosi <matrixhasu at gmail.com>
+##
+## DP: Fix the upstream manpage for a valid first line
+
+ at DPATCH@
+diff -urNad wmclock~/wmclock.man.in wmclock/wmclock.man.in
+--- wmclock~/wmclock.man.in 2007-12-27 19:27:36.512023741 +0100
++++ wmclock/wmclock.man.in 2007-12-27 19:27:49.856784215 +0100
+@@ -25,9 +25,7 @@
+ .TH wmclock 1x "@DATE@" "Version @VERSION@"
+ .\" ----------------------------------------------------------------
+ .SH NAME
+-.PP
+-.BR wmclock :
+-a dockable clock for the Window Maker window manager
++wmclock \- A dockable clock for the Window Maker window manager
+ .\" ----------------------------------------------------------------
+ .SH SYNOPSIS
+ .HP
diff --git a/debian/rules b/debian/rules
index be0812c..de45e31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,7 @@ include /usr/share/dpatch/dpatch.make
configure: configure-stamp
configure-stamp:
dh_testdir
- ./configure --prefix=/usr \
- --mandir=/usr/share/man
+ ./configure --prefix=/usr --mandir=/usr/share/man
touch configure-stamp
build: build-stamp
@@ -15,10 +14,11 @@ build-stamp: patch-stamp configure-stamp
$(MAKE)
touch build-stamp
-clean: unpatch
+clean: clean-patched unpatch
+clean-patched: patch-stamp
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
+ rm -f build-stamp configure-stamp patch-stamp
if [ -f Makefile ]; then \
rm -f month.xpm weekday.xpm; \
$(MAKE) clean; \
@@ -31,7 +31,7 @@ install: build
dh_testroot
dh_clean -k
dh_installdirs
- $(MAKE) install BINDIR=$(CURDIR)/debian/wmclock/usr/bin
+ +$(MAKE) install BINDIR=$(CURDIR)/debian/wmclock/usr/bin
for dir in lang.* debian/lang.*; do \
cp -r "$$dir" $(CURDIR)/debian/wmclock/usr/share/wmclock; \
done
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmclock.git
More information about the Pkg-wmaker-commits
mailing list