aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--debian/compat2
-rw-r--r--debian/control3
-rw-r--r--debian/copyright53
-rwxr-xr-xdebian/rules19
-rw-r--r--debian/source/format1
6 files changed, 20 insertions, 64 deletions
diff --git a/debian/changelog b/debian/changelog
index e86cac5..1c63dab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-meh (0-1) trusty; urgency=low
+meh (0-0) UNRELEASED; urgency=medium
- * Initial release (Closes: #0)
+ * Personal package, not meant for official inclusion
- -- VG <vg@devys.org> Tue, 20 Jan 2015 16:19:44 +0100
+ -- vg <vg@devys.org> Sun, 01 Jan 1984 00:00:00 +0000
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index c563e99..431d033 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,9 @@
Source: meh
Section: universe/x11
Priority: optional
-Maintainer: VG <vg@devys.org>
+Maintainer: vg <vg@devys.org>
Build-Depends: debhelper (>=9),
libxext-dev, libpng12-dev, libgif-dev, libjpeg-dev
-Standards-Version: 3.9.5
Homepage: https://github.com/jhawthorn/meh/
#Vcs-Git: git://git.debian.org/collab-maint/meh.git
#Vcs-Browser: http://git.debian.org/?p=collab-maint/meh.git;a=summary
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 533a261..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,53 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: meh
-Source: https://github.com/jhawthorn/meh/
-
-Files: *
-Copyright: 2008-2009 John Hawthorn <john.hawthorn@gmail.com>
-License: MIT License
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- .
- 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 AUTHORS OR COPYRIGHT
- HOLDERS 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.
-
-# If you want to use GPL v2 or later for the /debian/* files use
-# the following clauses, or change it to suit. Delete these two lines
-Files: debian/*
-Copyright: 2015 VG <vg@devys.org>
-License: GPL-2+
- This package 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 package 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, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
diff --git a/debian/rules b/debian/rules
index 6222c9b..fcc17c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,17 +4,28 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export PREFIX:=/usr
+# debian version rule:
+# 0.0 < 0.5 < 0.10 < 0.99 < 1 < 1.0~rc1 < 1.0 < 1.0+b1 < 1.0+nmu1 < 1.1 < 2.0
+
+VERSION = 0.3
+PACKAGEVERSION = $(VERSION)+$(shell date +%Y%m%d%H%M%S)
%:
dh $@
+# note for build:
# Delete manpages installed from upstream since not gzipped, and let debian
# helper do it instead.
-override_dh_installman:
+override_dh_auto_clean:
+override_dh_auto_test:
+override_dh_auto_build:
+override_dh_auto_install:
+ git clone --depth 1 /home/calendros/seele/autobuild/upstream/meh src
+ make -C src
+ make -C src install PREFIX=debian/meh
rm debian/meh/usr/share/man/man1/meh.1
dh_installman
-override_dh_auto_test:
- echo "bypass test because it fails on amd64 build"
+override_dh_gencontrol:
+ dh_gencontrol -- -v$(PACKAGEVERSION)
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)