[Pkg-wmaker-commits] [wmclock] 28/66: Imported Debian patch 1.0.14-2
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 10:52:51 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 440d6d9a76ddbbdb43c6d1cd25a73884628031a7
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Thu Sep 12 00:07:25 2013 -0500
Imported Debian patch 1.0.14-2
---
debian/changelog | 53 ++++++++++++++++++++++++++++-----------------------
debian/compat | 2 +-
debian/control | 7 +++----
debian/rules | 58 ++------------------------------------------------------
4 files changed, 35 insertions(+), 85 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7c9804e..975f35f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,21 @@
+wmclock (1.0.14-2) unstable; urgency=low
+
+ * New maintainer (Closes: #688534).
+ * debian/compat
+ + Bump to 9.
+ * debian/control
+ + Bump Standards-Version to 3.9.4, no changes required.
+ * debian/rules
+ + Simplified to debhelper 7 style.
+
+ -- Doug Torrance <dtorrance at monmouthcollege.edu> Thu, 12 Sep 2013 00:07:25 -0500
+
wmclock (1.0.14-1) unstable; urgency=low
* New upstream release.
-
* debian/control:
+ Do not recommend wmaker, as dockapps can be used with a number of other
- window managers (closes: #624484).
+ window managers (Closes: #624484).
+ Bump Standards-Version to 3.9.2 (no changes).
-- Julien BLACHE <jblache at debian.org> Thu, 02 Jun 2011 12:07:58 +0200
@@ -13,7 +24,6 @@ wmclock (1.0.13-1) unstable; urgency=low
* New upstream release.
* Switch to source format 3.0 (quilt).
-
* debian/control:
+ Bump Standards-Version to 3.9.1 (no changes).
+ Update Homepage field for new upstream website.
@@ -24,7 +34,6 @@ wmclock (1.0.13-1) unstable; urgency=low
+ Updated for new upstream website.
* debian/rules:
+ Removed dpatch support.
-
* debian/lang.polish:
+ Removed; a better version is now provided by upstream.
@@ -40,15 +49,13 @@ wmclock (1.0.13-1) unstable; urgency=low
wmclock (1.0.12.2-10) unstable; urgency=low
* debian/control:
- + New maintainer (closes: #490735).
+ + New maintainer (Closes: #490735).
+ Reorder Build-Depends.
+ Remove extraneous spaces in description.
-
* debian/changelog:
+ Fixed typos in previous entries.
* debian/README.source:
+ Remove useless file.
-
* debian/patches/00-fix_manpage_source_chgs_prior_adoption.dpatch:
+ Renamed to 20_manpage_xpm_notes.dpatch.
+ Add patch description.
@@ -64,7 +71,7 @@ wmclock (1.0.12.2-10) unstable; urgency=low
given on the command line. Fix got lost at some point.
* debian/patches/23_select_dont_sleep.dpatch:
+ Added; use select() instead of sleeping in order to reduce wakeups
- (closes: #495468).
+ (Closes: #495468).
-- Julien BLACHE <jblache at debian.org> Sun, 16 Nov 2008 18:42:27 +0100
@@ -74,7 +81,7 @@ wmclock (1.0.12.2-9) unstable; urgency=low
- removed x11proto-xext-dev build-dep since libxext-dev already depends on
it
- replaced xutils build-dep with xutils-dev; thanks to Daniel Schepler for
- the report; Closes: #485239
+ the report; (Closes: #485239)
- bump Standards-Version to 3.8.0
+ debian/README.source added
@@ -162,13 +169,13 @@ wmclock (1.0.12.2-5) unstable; urgency=low
wmclock (1.0.12.2-4) unstable; urgency=low
* Apply patch from Vino Fernando Crescini <jcrescin at cit.uws.edu.au> to
- fix -12 and -year combined display (closes: #228985).
+ fix -12 and -year combined display (Closes: #228985).
-- Romain Francoise <rfrancoise at debian.org> Sun, 25 Jan 2004 15:48:43 +0100
wmclock (1.0.12.2-3) unstable; urgency=low
- * New maintainer (closes: #214392).
+ * New maintainer (Closes: #214392).
* debian/control:
+ Update maintainer contact info.
+ Bump Standards-Version to 3.6.1.0.
@@ -179,43 +186,41 @@ wmclock (1.0.12.2-3) unstable; urgency=low
* debian/copyright:
+ Update maintainer information.
+ Clarify license info.
- + Reword sentence about the location of the GNU GPL on Debian
+ + Reword sentence about the location of the GNU GPL on Debian
systems.
- * debian/rules:
+ * debian/rules:
+ Major facelift, separating configure and build stages.
+ Remove old DH_COMPAT variables.
+ Install localized XPM images in /usr/share/wmclock/.
+ Call dh_installmenu -n.
* debian/compat: New file.
- * debian/README.Debian: New file, explaining how to use the localized
+ * debian/README.Debian: New file, explaining how to use the localized
display.
- * debian/wmclock.{postinst,postrm,menu}: New files. Install wmclock
+ * debian/wmclock.{postinst,postrm,menu}: New files. Install wmclock
in the Debian menu in Apps/Tools.
- * Don't ship the manpage in the Debian diff, use the version provided
- by upstream since they are identical. Include information about the
+ * Don't ship the manpage in the Debian diff, use the version provided
+ by upstream since they are identical. Include information about the
localized XPM files.
- * Acknowledging NMU (closes: #105699).
- * Include patch to fix -year display (closes: #126742).
+ * Acknowledging NMU (Closes: #105699).
+ * Include patch to fix -year display (Closes: #126742).
-- Romain Francoise <rfrancoise at debian.org> Mon, 6 Oct 2003 20:19:30 +0200
wmclock (1.0.12.2-2.1) unstable; urgency=low
- * NMU
+ * Non-maintainer upload.
* debian/control: added build-dependency on xutils (Closes: #105699)
-- Branden Robinson <branden at debian.org> Wed, 18 Jul 2001 17:27:06 -0500
wmclock (1.0.12.2-2) unstable; urgency=low
- * Source dependency xlibs-dev added. Closes: #99377
+ * Source dependency xlibs-dev added. (Closes: #99377)
-- Szabolcs Horvath <horvaths at janus.gimsz.sulinet.hu> Mon, 4 Jun 2001 07:58:30 +0000
wmclock (1.0.12.2-1) unstable; urgency=low
- * Initial Release. Closes: #93782
+ * Initial Release. (Closes: #93782)
-- Szabolcs Horvath <horvaths at janus.gimsz.sulinet.hu> Sun, 15 Apr 2001 07:08:38 +0000
-
-
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 989cbfb..2d7def6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
Source: wmclock
Section: x11
Priority: optional
-Maintainer: Julien BLACHE <jblache at debian.org>
-Build-Depends: debhelper (>= 5), libxpm-dev, libx11-dev, libxt-dev, libxext-dev, xutils-dev
-Standards-Version: 3.9.2
+Maintainer: Doug Torrance <dtorrance at monmouthcollege.edu>
+Build-Depends: debhelper (>= 9), libxpm-dev, libx11-dev, libxt-dev, libxext-dev, xutils-dev
+Standards-Version: 3.9.4
Homepage: http://www.bluestop.org/wmclock/
Package: wmclock
@@ -14,4 +14,3 @@ Description: dockable clock applet for Window Maker
time in a dockable tile. It features multiple language support, 24h
or 12h time display, and can run a user-specified program on mouse
click.
-
diff --git a/debian/rules b/debian/rules
index 44c2155..933b1da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,57 +1,3 @@
#!/usr/bin/make -f
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- ./configure --prefix=/usr --mandir=/usr/share/man
- touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
- $(MAKE)
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- if [ -f Makefile ]; then \
- rm -f month.xpm weekday.xpm; \
- $(MAKE) clean; \
- rm -f Makefile wmclock.man wmclock._man; \
- fi
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- +$(MAKE) install BINDIR=$(CURDIR)/debian/wmclock/usr/bin
- for dir in lang.*; do \
- cp -r "$$dir" $(CURDIR)/debian/wmclock/usr/share/wmclock; \
- done
-
-binary-indep: build install;
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installexamples
- dh_installmenu
- dh_installman
- dh_installchangelogs ChangeLog
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+%:
+ dh $@
\ No newline at end of file
--
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