[Pkg-wmaker-commits] [wmmoonclock] 20/23: Import Debian changes 1.27-30
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Aug 14 22:54:12 UTC 2017
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmmoonclock.
commit c783e0a18096f3c3a7520ee74a64d33d964abe29
Author: Rodolfo García Peñas (kix) <kix at kix.es>
Date: Sun Aug 7 15:41:54 2011 +0200
Import Debian changes 1.27-30
wmmoonclock (1.27-30) unstable; urgency=low
* New maintainer (Closes: #588837)
* Standard version is now 3.9.2
* Package is now lintian clean
* new wmmoonclock.{manpages, menu} files
* Added text info about upstream version in watch
* debian/copyright is now DEP-5
* debian/patches are now DEP-3
---
debian/changelog | 12 ++++
debian/control | 6 +-
debian/copyright | 55 +++++++++++-------
debian/patches/01_all_previous_diff.diff | 4 +-
debian/patches/02_update_time.diff | 4 +-
.../03_add_southern_hemisphere_support.diff | 5 +-
.../patches/04_fix_hyphen_used_as_minus_sign.diff | 5 +-
debian/postinst | 9 ---
debian/postrm | 16 ------
debian/rules | 67 ++++------------------
debian/watch | 2 +-
debian/wmmoonclock.manpages | 1 +
debian/{menu => wmmoonclock.menu} | 0
13 files changed, 74 insertions(+), 112 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index eabe2ac..5b7f9ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+wmmoonclock (1.27-30) unstable; urgency=low
+
+ * New maintainer (Closes: #588837)
+ * Standard version is now 3.9.2
+ * Package is now lintian clean
+ * new wmmoonclock.{manpages, menu} files
+ * Added text info about upstream version in watch
+ * debian/copyright is now DEP-5
+ * debian/patches are now DEP-3
+
+ -- Rodolfo García Peñas (kix) <kix at kix.es> Sun, 7 Aug 2011 15:41:54 +0200
+
wmmoonclock (1.27-29) unstable; urgency=low
* Switch to dpkg-source 3.0 (quilt) format.
diff --git a/debian/control b/debian/control
index 48f5ddf..16b82f4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,10 @@
Source: wmmoonclock
Section: x11
Priority: optional
-Maintainer: Denis Briand <denis at narcan.fr>
+Maintainer: Rodolfo García Peñas (kix) <kix at kix.es>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), libx11-dev, libxext-dev, libxpm-dev
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50~), libx11-dev, libxext-dev, libxpm-dev
+Standards-Version: 3.9.2
Package: wmmoonclock
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 28080c9..7d0f41c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,24 +1,37 @@
-This package was debianized by Adam Klein <aklein at debian.org> on
-New maintainer is Denis Briand <denis at narcan.fr>
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&pathrev=174
+Upstream-Name: wmMoonClock
+Upstream-Contact: Michael G. Henderson <mghenderson at lanl.gov>
+Source: http://repo.or.cz/w/dockapps.git
-Thu, 24 Dec 1998. It was downloaded from
-http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml.
+Files: *
+Copyright: 1998, Michael G. Henderson <mghenderson at lanl.gov>
+ 1999, Michael G. Henderson <mghenderson at lanl.gov>
+License: GPL-2+
-Copyright (c) 1998-1999 Michael G. Henderson <mghenderson at lanl.gov>
+Files: debian/*
+Copyright: 1998, Adam Klein <aklein at debian.org>
+ 2009, Denis Briand <denis at narcan.fr>
+ 2011, Rodolfo García Peñas (kix) <kix at kix.es>
+License: GPL-2+
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL-2.
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/01_all_previous_diff.diff b/debian/patches/01_all_previous_diff.diff
index e477e23..5a3bf8c 100644
--- a/debian/patches/01_all_previous_diff.diff
+++ b/debian/patches/01_all_previous_diff.diff
@@ -1,4 +1,6 @@
-All previous diff before I maintain it.
+Description: All previous diff before I maintain it.
+Author: Denis Briand <denis at narcan.fr>
+Last-Update: 2009-06-26
==================================================================================
diff -urN wmmoonclock-1.27.orig/Src/CalcEphem.c wmmoonclock-1.27.new/Src/CalcEphem.c
--- wmmoonclock-1.27.orig/Src/CalcEphem.c 1999-06-07 16:16:04.000000000 +0200
diff --git a/debian/patches/02_update_time.diff b/debian/patches/02_update_time.diff
index 0903e2f..be891d3 100644
--- a/debian/patches/02_update_time.diff
+++ b/debian/patches/02_update_time.diff
@@ -1,5 +1,7 @@
-Modify nMax values to sensible values for the new delay timer (Closes: #479229).
+Description: Modify nMax values to sensible values for the new delay timer.
Author: Joerg Dietrich <joerg at dietrich.net>
+Last-Update: 2009-06-26
+Bug-Debian: http://bugs.debian.org/479229
==================================================================
--- wmmoonclock-1.27.orig/Src/wmMoonClock.c 2009-03-20 16:20:17.956636905 +0100
+++ wmmoonclock-1.27/Src/wmMoonClock.c 2009-03-20 16:35:25.361195797 +0100
diff --git a/debian/patches/03_add_southern_hemisphere_support.diff b/debian/patches/03_add_southern_hemisphere_support.diff
index 362155a..b5739e4 100644
--- a/debian/patches/03_add_southern_hemisphere_support.diff
+++ b/debian/patches/03_add_southern_hemisphere_support.diff
@@ -1,6 +1,7 @@
-add southern hemisphere support (Closes: #537480).
+Description: Add southern hemisphere support.
Author: Alvaro Steiger <alvaro.steiger at gmail.com>
-Index: wmmoonclock-1.27/Src/wmMoonClock.c
+Last-Update: 2009-06-26
+Bug-Debian: http://bugs.debian.org/537480
===================================================================
--- wmmoonclock-1.27.orig/Src/wmMoonClock.c 2009-07-18 23:26:03.000000000 +0200
+++ wmmoonclock-1.27/Src/wmMoonClock.c 2009-07-18 23:30:36.000000000 +0200
diff --git a/debian/patches/04_fix_hyphen_used_as_minus_sign.diff b/debian/patches/04_fix_hyphen_used_as_minus_sign.diff
index c93e7d9..a02c9a1 100644
--- a/debian/patches/04_fix_hyphen_used_as_minus_sign.diff
+++ b/debian/patches/04_fix_hyphen_used_as_minus_sign.diff
@@ -1,5 +1,6 @@
-fix_hyphen_used_as_minus_sign in man file
-Index: wmmoonclock-1.27/Src/wmMoonClock.1
+Description: fix_hyphen_used_as_minus_sign in man file
+Author: Joerg Dietrich <joerg at dietrich.net>
+Last-Update: 2009-06-26
===================================================================
--- wmmoonclock-1.27.orig/Src/wmMoonClock.1 2009-07-26 00:22:55.000000000 +0200
+++ wmmoonclock-1.27/Src/wmMoonClock.1 2009-07-26 00:24:24.000000000 +0200
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index 70fed3c..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = configure ] && [ -x /usr/bin/update-menus ]; then
- update-menus
-fi
-
-exit 0
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644
index 78bac52..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = purge ]; then
- if [ -x /usr/bin/ucf ]; then
- ucf --purge /etc/menu/wmmoonclock
- fi
- rm -f /etc/menu/wmmoonclock /etc/menu/wmmoonclock.*
-fi
-
-if [ -x /usr/bin/update-menus ]; then
- update-menus
-fi
-
-exit 0
diff --git a/debian/rules b/debian/rules
index bea0739..6c70ed5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,64 +1,19 @@
#!/usr/bin/make -f
+# GNU Copyright 2011 Rodolfo García Peñas (kix) <kix at kix.es>
-#export DH_VERBOSE=1
+# export DH_VERBOSE=1
-BUILDDIR = debian/wmmoonclock
-DEBDIR = $(BUILDDIR)/DEBIAN
-DOCDIR = $(BUILDDIR)/usr/share/doc/wmmoonclock
+%:
+ dh $@
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-export CFLAGS
-
-clean:
- dh_testdir
- -rm -f build debian/files debian/substvars
- [ ! -f Src/Makefile ] || $(MAKE) -C Src clean
- -rm -rf debian/wmmoonclock
+override_dh_clean:
+ $(MAKE) -C Src clean
dh_clean
-build:
- dh_testdir
- $(MAKE) -C Src
- touch build
-
-binary: binary-arch
-
-binary-indep:
-
-binary-arch: build
- dh_testdir
- dh_testroot
- rm -rf debian/wmmoonclock
-
+override_dh_auto_install:
$(MAKE) -C Src install DESTDIR=$(CURDIR)/debian/wmmoonclock
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- strip -R .comment -R .note $(BUILDDIR)/usr/bin/wmMoonClock
-endif
- gzip -9 $(BUILDDIR)/usr/share/man/man1/wmMoonClock.1
- ln -s wmMoonClock $(BUILDDIR)/usr/bin/wmmoonclock
- ln -s wmMoonClock.1.gz $(BUILDDIR)/usr/share/man/man1/wmmoonclock.1.gz
- install -D -p -m 0644 debian/menu $(BUILDDIR)/usr/share/menu/wmmoonclock
-
- install -D -p -m 0644 debian/changelog $(DOCDIR)/changelog.Debian
- install -D -p -m 0644 debian/changelog.upstream $(DOCDIR)/changelog
- install -p -m 0644 debian/copyright debian/README.Debian $(DOCDIR)
- gzip -9 $(DOCDIR)/changelog*
-
- install -d -p -m 0755 $(DEBDIR)
- install -p -m 0644 debian/control $(DEBDIR)
- install -p -m 0755 debian/postinst debian/postrm $(DEBDIR)
- cd $(BUILDDIR) && find usr -type f -print0 | xargs -0 md5sum > DEBIAN/md5sums
- chmod 0644 $(DEBDIR)/md5sums
-
- dpkg-shlibdeps $(BUILDDIR)/usr/bin/wmMoonClock
- dpkg-gencontrol -isp -pwmmoonclock -P$(BUILDDIR)
- chown -R root:root $(BUILDDIR)
- chmod -R go=u-w $(BUILDDIR)
- dpkg --build $(BUILDDIR) ..
+ ln -s wmMoonClock $(CURDIR)/debian/wmmoonclock/usr/bin/wmmoonclock
+ ln -s wmMoonClock.1.gz $(CURDIR)/debian/wmmoonclock/usr/share/man/man1/wmmoonclock.1.gz
-.PHONY: clean binary-indep binary-arch binary
+override_dh_installchangelogs:
+ dh_installchangelogs debian/changelog.upstream upstream
diff --git a/debian/watch b/debian/watch
index 3fe8e92..ad2027d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1 +1 @@
-#there is no upstream repository
+# The upstream version is now in http://repo.or.cz/w/dockapps.git
diff --git a/debian/wmmoonclock.manpages b/debian/wmmoonclock.manpages
new file mode 100644
index 0000000..bcadf9f
--- /dev/null
+++ b/debian/wmmoonclock.manpages
@@ -0,0 +1 @@
+Src/wmMoonClock.1
diff --git a/debian/menu b/debian/wmmoonclock.menu
similarity index 100%
rename from debian/menu
rename to debian/wmmoonclock.menu
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmmoonclock.git
More information about the Pkg-wmaker-commits
mailing list