[Pkg-wmaker-commits] [wmgtemp] 12/45: Imported Debian patch 0.8-1

Doug Torrance dtorrance-guest at moszumanska.debian.org
Tue Aug 25 02:58:04 UTC 2015


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

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

commit 949b021995713615905a9cdad103503e1f5006d2
Merge: 6390383 33bea76
Author: Dario Minnucci <midget at debian.org>
Date:   Thu Feb 4 08:32:12 2010 +0100

    Imported Debian patch 0.8-1

 Artistic                                       |  0
 BUGS                                           |  0
 CREDITS                                        |  0
 INSTALL                                        |  0
 Makefile                                       |  0
 README                                         |  0
 TODO                                           |  0
 debian/changelog                               | 26 +++++++++
 debian/compat                                  |  1 +
 debian/control                                 | 11 ++--
 debian/copyright                               | 28 ++++++---
 debian/menu                                    |  2 +-
 debian/patches/000_fix_hypens_in_wmtemp.1.diff | 17 ++++++
 debian/patches/000_fix_on_src_wmtemp.c.diff    | 17 ++++++
 debian/patches/series                          |  2 +
 debian/rules                                   |  4 +-
 debian/source/format                           |  1 +
 debian/watch                                   |  2 +
 examples/wmgtemprc                             |  0
 src/.deps                                      |  2 +-
 src/Makefile                                   |  7 ++-
 src/wmgeneral/list.c                           |  0
 src/wmgeneral/list.h                           |  0
 src/wmgeneral/misc.c                           |  0
 src/wmgeneral/misc.h                           |  0
 src/wmgeneral/wmgeneral.c                      |  0
 src/wmgeneral/wmgeneral.h                      |  0
 src/wmgtemp-interface-mask.xbm                 |  0
 src/wmgtemp-interface.xpm                      |  0
 src/wmgtemp.c                                  | 78 +++++++++++++++++++++-----
 wmgtemp.1                                      |  0
 31 files changed, 164 insertions(+), 34 deletions(-)

diff --cc debian/changelog
index 41350ed,0000000..33a2a19
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,152 -1,0 +1,178 @@@
++wmgtemp (0.8-1) unstable; urgency=low
++
++  * QA upload.
++  * Switch to dpkg-source 3.0 (quilt) format
++  * debian/watch: Added.
++  * New upstream release (0.8) (Closes: #454492, #465335)
++  * debian/control: 
++    + Debhelper updated to >=7
++    + Maintainer field set to Debian QA Group
++    + Added ${misc:Depends} to avoid lintian W: debhelper-but-no-misc-depends
++    + Bump Standards-Version to 3.8.4
++    + Added 'Homepage' field.
++    + Priority downgrade to 'extra' because depends on 'lm-sensors' which is
++      extra. Filed bug to ftp.debian.org #568356
++  * debian/rules:
++    + export DH_COMPAT was removed
++    + s/dh_clean -k/dh_prep/ to avoid lintian W: dh-clean-k-is-deprecated
++  * Menu section chaged from 'Apps/System' to 'Applications/System/Monitoring'
++    to get rid of lintian W: menu-item-uses-apps-section
++  * debian/copyright: Migrated to DEP-5 format.
++  * debian/patches:
++    + 000_fix_on_src_wmtemp.c.diff: Add missing '('
++    + 000_fix_hypens_in_wmtemp.1.diff: Fix hyphen in manpage
++
++ -- Dario Minnucci <midget at debian.org>  Thu, 04 Feb 2010 08:32:12 +0100
++
 +wmgtemp (0.7-1) unstable; urgency=low
 +
 +  * New upstream version.
 +    + Obsoleted the patch that was added to fix #185512, since a run-time
 +      option for swapping temperatures now exists.
 +    + Obsoleted the patch that fixed a multi-line string in printf.
 +    + Obsoleted/updated the patch for the manual page to avoid listing
 +      chipsets and instead point to lm_sensors manuals, and fix typos.
 +  * Cleaned up the packaging a bit.
 +
 + -- Josip Rodin <joy-packages at debian.org>  Mon, 11 Sep 2006 02:14:31 +0200
 +
 +wmgtemp (0.6-5) unstable; urgency=low
 +
 +  * Adopting the package, closes: #349201.
 +
 + -- Josip Rodin <joy-packages at debian.org>  Mon, 11 Sep 2006 02:05:33 +0200
 +
 +wmgtemp (0.6-4) unstable; urgency=low
 +
 +  * Orphaning the package.
 +  * NMU ACK. (closes: bug#347099)
 +
 + -- LENART Janos <ocsi at debian.org>  Sat, 21 Jan 2006 15:17:34 +0100
 +
 +wmgtemp (0.6-3.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Replace build-dependency on xlibs-dev with an explicit build-dependency
 +    on each required package. (Closes: #347099)
 +
 + -- Steinar H. Gunderson <sesse at debian.org>  Sat, 21 Jan 2006 15:01:38 +0100
 +
 +wmgtemp (0.6-3) unstable; urgency=high
 +
 +  * Linking to libsensors3.                         (closes: Bug#237348)
 +  * Changed Arch: to any. Dep: will do it (I hope). (closes: Bug#238252)
 +
 + -- Lenart Janos <ocsi at debian.org>  Sun, 21 Mar 2004 12:57:14 +0100
 +
 +wmgtemp (0.6-2) unstable; urgency=medium
 +
 +  * lm-sensors moved to Depends: in order to be sure /etc/sensors.conf
 +    exists, closes: #201762
 +  * Rebuild should have fixed the wacky Depends: on libsensors-1debian1,
 +    closes: #211081
 +  * Lot's of thank to Joy for his great work on wmgtemp while I am away.
 +    closes: #191538, #197022, #185512, #185513, #185514.
 +
 + -- Lenart Janos <ocsi at debian.org>  Fri, 26 Dec 2003 12:05:27 +0100
 +
 +wmgtemp (0.6-1.2) unstable; urgency=high
 +
 +  * Non-maintainer upload, to recompile against proper libsensors-dev
 +    and eliminate obsoleted libsensors1 dependency, closes: #197022.
 +
 + -- Josip Rodin <joy-packages at debian.org>  Fri, 27 Jun 2003 19:00:47 +0200
 +
 +wmgtemp (0.6-1.1) unstable; urgency=low
 +
 +  * Non-maintainer upload, approved by the maintainer.
 +  * Recompiled against the new libsensors-dev, plus a little patch
 +    to remove a multi-line string in printf which doesn't work with
 +    new GCC, closes: #191538.
 +  * Updated upstream URL, closes: #185514.
 +  * Removed the duplication in the manual page and (after cross-checking)
 +    merged it into the upstream file, closes: #185513.
 +  * Remove mention of chips from the description since that code was
 +    removed, it's now generic.
 +  * Use temp1 for system and temp2 for processor temperature with via686a,
 +    like the old version did, closes: #185512.
 +    I've got an Abit KG7, the author has Abit KT7 -- these two boards should
 +    have the same south bridge (VIA 686B), so if the settings really differ,
 +    then the whole idea of guessing which sensor is which seems rather
 +    pointless :(
 +
 + -- Josip Rodin <joy-packages at debian.org>  Tue, 10 Jun 2003 14:46:15 +0200
 +
 +wmgtemp (0.6-1) unstable; urgency=low
 +
 +  * New upstream release.                           (closes: Bug#169498)
 +
 + -- Lenart Janos <ocsi at debian.org>  Tue, 11 Mar 2003 21:36:57 +0100
 +
 +wmgtemp (0.5-4) unstable; urgency=low
 +
 +  * Typo fixed in the description.                  (closes: Bug#125492)
 +  * Upgraded Standards-Version.
 +
 + -- Lenart Janos <ocsi at debian.org>  Sat, 22 Dec 2001 16:25:10 +0100
 +
 +wmgtemp (0.5-3) unstable; urgency=low
 +
 +  * Added Build-Depends: xlibs-dev.                 (closes: Bug#123153)
 +
 + -- Lenart Janos <ocsi at debian.org>  Mon, 10 Dec 2001 22:08:12 +0100
 +
 +wmgtemp (0.5-2) unstable; urgency=low
 +
 +  * Fixed menu by Josip Rodin <joy at debian.org>.     (closes: Bug#119945)
 +  * Emacs-thingy removed from this changelog.
 +
 + -- Lenart Janos <ocsi at debian.org>  Sat, 17 Nov 2001 13:04:58 +0100
 +
 +wmgtemp (0.5-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Lenart Janos <ocsi at debian.org>  Tue, 12 Jun 2001 21:08:31 +0200
 +
 +wmgtemp (0.4-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Added suggestion against i2c-source.
 +  * Added example.
 +  * Changed description.
 +
 + -- Lenart Janos <ocsi at debian.org>  Tue, 17 Apr 2001 21:17:39 +0200
 +
 +wmgtemp (0.3-3) unstable; urgency=low
 +
 +  * Upgraded Standards-Version.
 +  * Converted to use debhelper v3.
 +
 + -- Lenart Janos <ocsi at debian.org>  Sat, 31 Mar 2001 18:45:23 +0200
 +
 +wmgtemp (0.3-2) unstable; urgency=low
 +
 +  * Added manpage, currently in the diff only.       (closes: Bug#88697)
 +  * Removed dh_testversion from debian/rules.
 +
 + -- Lenart Janos <ocsi at debian.org>  Wed, 28 Mar 2001 21:11:00 +0200
 +
 +wmgtemp (0.3-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Makefile's patch removed from diff since it's now included in the
 +    upstream.
 +
 + -- Lenart Janos <ocsi at debian.org>  Tue,  6 Mar 2001 05:54:28 +0100
 +
 +wmgtemp (0.1-1.1) unstable; urgency=medium
 +
 +  * Moved from /usr/X11R6/bin to /usr/bin
 +
 + -- Lenart Janos <ocsi at debian.org>  Sat, 24 Feb 2001 17:28:02 +0100
 +
 +wmgtemp (0.1-1) unstable; urgency=low
 +
 +  * Initial Release.                                 (closes: Bug#87146)
 +
 + -- Lenart Janos <ocsi at debian.org>  Fri, 23 Feb 2001 00:29:54 +0100
diff --cc debian/compat
index 0000000,0000000..7f8f011
new file mode 100644
--- /dev/null
+++ b/debian/compat
@@@ -1,0 -1,0 +1,1 @@@
++7
diff --cc debian/control
index 08884bb,0000000..d4a2401
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,18 -1,0 +1,19 @@@
 +Source: wmgtemp
 +Section: utils
- Priority: optional
- Maintainer: Josip Rodin <joy-packages at debian.org>
- Build-Depends: debhelper (>> 5), libsensors-dev, libx11-dev, libxext-dev, libxpm-dev
- Standards-Version: 3.6.1
++Priority: extra
++Maintainer: Debian QA Group <packages at qa.debian.org>
++Build-Depends: debhelper (>=7), libsensors-dev, libx11-dev, libxext-dev, libxpm-dev
++Standards-Version: 3.8.4
++Homepage: http://www.fluxcode.net
 +
 +Package: wmgtemp
 +Architecture: any
- Depends: ${shlibs:Depends}, lm-sensors
++Depends: ${misc:Depends}, ${shlibs:Depends}, lm-sensors
 +Suggests: i2c-source
 +Description: Temperature sensor dockapp for Window Maker
 + wmgtemp is a dock app (a 64x64 window) which graphically displays the
 + CPU and SYS temperatures of motherboards supported by lm_sensors.
 + .
 + To make wmgtemp work, one needs to set up lm_sensors and I2C.
 + On Debian systems, the lm-sensors-source and i2c-source packages
 + are used to set these up.
diff --cc debian/copyright
index 09ca508,0000000..14a7bc5
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,12 -1,0 +1,24 @@@
- This package was debianized by Lenart Janos <ocsi at debian.org> on
- Fri, 23 Feb 2001 00:29:54 +0100.
- It is currently maintained by Josip Rodin <joy-packages at debian.org>.
++Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
++Name: wmtemp
++Maintainer: Roger Dunce <kronos at fluxcode.net>
++Source: http://www.fluxcode.net
 +
- The original source can be found at: http://www.fluxcode.net/
 +
- Upstream author: Roger Dunce <kronos at fluxcode.net>
++Files: *
++Copyright: 2001-2007, Roger Dunce <kronos at fluxcode.net>
++License: Artistic
++   On Debian systems the full text of the Artistic License 
++   can be found in the `/usr/share/common-licenses/Artistic'
++   file.
 +
- You may distribute this program under the terms of the Artistic License.
 +
- On Debian systems, the complete text of the Artistic License
- can be found in /usr/share/common-licenses/Artistic.
++Files: debian/*
++Copyright: 2001-2004, Lenart Janos <ocsi at debian.org>
++           2001-2006, Josip Rodin <joy-packages at debian.org>
++                2006, Steinar H. Gunderson <sesse at debian.org>
++                2010, Dario Minnucci <midget at debian.org>
++License: Artistic
++   On Debian systems the full text of the Artistic License 
++   can be found in the `/usr/share/common-licenses/Artistic'
++   file.
++
diff --cc debian/menu
index eb30546,0000000..6e51e4f
mode 100644,000000..100644
--- a/debian/menu
+++ b/debian/menu
@@@ -1,2 -1,0 +1,2 @@@
- ?package(wmgtemp):needs="x11" section="Apps/System" title="wmgtemp" \
++?package(wmgtemp):needs="x11" section="Applications/System/Monitoring" title="wmgtemp" \
 +  longtitle="Temperature sensor" command="/usr/bin/wmgtemp"
diff --cc debian/patches/000_fix_hypens_in_wmtemp.1.diff
index 0000000,0000000..7d4d501
new file mode 100644
--- /dev/null
+++ b/debian/patches/000_fix_hypens_in_wmtemp.1.diff
@@@ -1,0 -1,0 +1,17 @@@
++#
++# Description: Fix hyphen in manpage
++# Author: Dario Minnucci <midget at debian.org>
++#
++Index: wmgtemp-0.8/wmgtemp.1
++===================================================================
++--- wmgtemp-0.8.orig/wmgtemp.1	2010-02-04 08:09:08.283513798 +0100
+++++ wmgtemp-0.8/wmgtemp.1	2010-02-04 08:09:19.467566826 +0100
++@@ -108,7 +108,7 @@
++ min:25
++ max:35
++ execat:80
++-exec:shutdown -h 10
+++exec:shutdown \-h 10
++ swap:n
++ quiet:y
++ feature1:temp1
diff --cc debian/patches/000_fix_on_src_wmtemp.c.diff
index 0000000,0000000..540e5a5
new file mode 100644
--- /dev/null
+++ b/debian/patches/000_fix_on_src_wmtemp.c.diff
@@@ -1,0 -1,0 +1,17 @@@
++#
++# Description: Add missing '('
++# Author: Dario Minnucci <midget at debian.org>
++#
++Index: wmgtemp-0.8/src/wmgtemp.c
++===================================================================
++--- wmgtemp-0.8.orig/src/wmgtemp.c	2010-02-04 07:05:26.607533083 +0100
+++++ wmgtemp-0.8/src/wmgtemp.c	2010-02-04 07:06:11.023941440 +0100
++@@ -627,7 +627,7 @@
++   FILE *config_file;
++   int res;
++ 
++-  config_file = fopen"/etc/sensors.conf", "r");
+++  config_file = fopen("/etc/sensors.conf", "r");
++ 
++   if(config_file == NULL) {
++     fprintf(stderr, "Error opening /etc/sensors.conf\n");
diff --cc debian/patches/series
index 0000000,0000000..7786e08
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++000_fix_on_src_wmtemp.c.diff
++000_fix_hypens_in_wmtemp.1.diff
diff --cc debian/rules
index eb4a223,0000000..953605a
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,50 -1,0 +1,48 @@@
 +#!/usr/bin/make -f
 +# debian/rules for wmgtemp, by Josip Rodin
 +# based on files by Joey Hess and Janos Lenart.
 +
 +#export DH_VERBOSE=1
 +
- export DH_COMPAT=5
- 
 +build: src/wmgtemp
 +
 +src/wmgtemp: src/Makefile
 +	dh_testdir
 +	$(MAKE) depend
 +	$(MAKE)
 +
 +clean:
 +	dh_testdir
 +	dh_testroot
 +	$(MAKE) clean
 +	dh_clean
 +
 +install: build
 +	dh_testdir
 +	dh_testroot
- 	dh_clean -k
++	dh_prep
 +	dh_installdirs usr/bin
 +	$(MAKE) install INSTDIR=$(CURDIR)/debian/wmgtemp/usr/bin MANINSTDIR=$(CURDIR)/debian/wmgtemp/usr/share/man/man1
 +
 +binary-indep:
 +
 +binary-arch: build install
 +	dh_testdir
 +	dh_testroot
 +	dh_installdocs TODO
 +	dh_installchangelogs
 +	chmod -x examples/wmgtemprc
 +	dh_installexamples examples/wmgtemprc
 +	dh_installmenu
 +	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
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
diff --cc debian/watch
index 0000000,0000000..561f1a2
new file mode 100644
--- /dev/null
+++ b/debian/watch
@@@ -1,0 -1,0 +1,2 @@@
++version=3
++http://www.fluxcode.net/ wmgtemp-(.*)\.tar\.bz2 

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



More information about the Pkg-wmaker-commits mailing list