fix conflict

15 files changed, 6 insertions, 212 deletions

diff --git a/Makefile b/Makefile
deleted file mode 100644
index f8214d8..0000000
--- a/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-NAME=guprecords
-all: version documentation build
-
-# THIS IS NEEDED BY THE DEBIAN TOOLS
-
-# Builds the project. Since this is only a fake project, it just copies a script.
-build:
-	cp -p ./src/$(NAME) bin/$(NAME)
-	sed -i "s/VERSION_DEVEL/$$(cat .version)/" bin/$(NAME)
-	
-# 'install' installes a fake-root, which will be used to build the Debian package
-# $DESTDIR is actually set by the Debian tools.
-install:
-	test ! -d $(DESTDIR)/usr/bin && mkdir -p $(DESTDIR)/usr/bin || exit 0
-	test ! -d $(DESTDIR)/usr/share/$(NAME) && mkdir -p $(DESTDIR)/usr/share/$(NAME) || exit 0
-	cp ./bin/* $(DESTDIR)/usr/bin
-	#cp -r ./lib $(DESTDIR)/usr/share/$(NAME)/lib
-
-deinstall:
-	test ! -z "$(DESTDIR)" && test -f $(DESTDIR)/usr/bin/$(NAME) && rm $(DESTDIR)/usr/bin/$(NAME) || exit 0
-	test ! -z "$(DESTDIR)/usr/share/$(NAME)" && -d $(DESTDIR)/usr/share/$(NAME) && rm -r $(DESTDIR)/usr/share/$(NAME) || exit 0
-
-clean:
-	rm bin/*
-
-# ADDITIONAL RULES:
-
-# Parses the version out of the Debian changelog
-version:
-	cut -d' ' -f2 debian/changelog | head -n 1 | sed 's/(//;s/)//' > .version
-
-# Builds the documentation into a manpage
-documentation:
-	pod2man --release="$(NAME) $$(cat .version)" \
-		--center="User Commands" ./docs/$(NAME).pod > ./docs/$(NAME).1
-	pod2text ./docs/$(NAME).pod > ./docs/$(NAME).txt
-	# For Github
-	cp ./docs/${NAME}.pod README.pod
-
-# Build a debian package (don't sign it, modify the arguments if you want to sign it)
-deb: all
-	dpkg-buildpackage
-
-dch: 
-	dch -i
-
-dput:
-	dput -u wheezy-buetowdotorg ../$(NAME)_$$(cat ./.version)_amd64.changes
-	dput -u jessie-buetowdotorg ../$(NAME)_$$(cat ./.version)_amd64.changes
-
-release: all dch deb
-	bash -c "git tag $$(cat .version)"
-	git push --tags
-	git commit -a -m 'New release'
-	git push origin master
-
-clean-top:
-	rm ../$(NAME)_*.tar.gz
-	rm ../$(NAME)_*.dsc
-	rm ../$(NAME)_*.changes
-	rm ../$(NAME)_*.deb
-
diff --git a/bin/.gitignore b/bin/.gitignore
deleted file mode 100644
index 5e7d273..0000000
--- a/bin/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
diff --git a/debian/README b/debian/README
deleted file mode 100644
index c4b96e7..0000000
--- a/debian/README
+++ /dev/null
@@ -1,7 +0,0 @@
-The Debian Package guprecords
-----------------------------
-
-This is just a humble go project. Not sure if everything meets the debian 
-policy though. Alt least the resulting debian package passes a pedantic lintian
-
- -- Paul Buetow <paul@buetow.org>  Wed, 02 Jan 2013 15:23:53 +0200
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 566d018..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,71 +0,0 @@
-guprecords (0.2.2) stable; urgency=low
-
-  * Add README.pod for github page
-
- -- Paul Buetow <paul@buetow.org>  Sun, 22 Jun 2014 11:29:44 +0200
-
-guprecords (0.2.1) stable; urgency=low
-
-  * Remove make dput from release Makefile target
-
- -- Paul Buetow <paul@buetow.org>  Fri, 20 Jun 2014 00:21:52 +0200
-
-guprecords (0.2.0) stable; urgency=low
-
-  * Add --nofqdn switch, displays only the hostnames and not the FQDNs
-
- -- Paul Buetow <paul@buetow.org>  Fri, 20 Jun 2014 00:20:35 +0200
-
-guprecords (0.1.8) stable; urgency=low
-
-  * Merge
-
- -- Paul Buetow <paul@buetow.org>  Sat, 14 Jun 2014 10:57:19 +0200
-
-guprecords (0.1.7) stable; urgency=low
-
-  * Another try to add a Package for Jessie
-
- -- Paul Buetow <paul@buetow.org>  Sat, 14 Jun 2014 10:55:29 +0200
-
-guprecords (0.1.6) stable; urgency=low
-
-  * Also add Package for Jessie
-
- -- Paul Buetow <paul@buetow.org>  Sat, 14 Jun 2014 10:49:23 +0200
-
-guprecords (0.1.5) stable; urgency=low
-
-  * Typo in manual page fix.
-
- -- Paul Buetow <paul@buetow.org>  Sun, 02 Mar 2014 14:01:12 +0100
-
-guprecords (0.1.4) stable; urgency=low
-
-  * Fix the --help output.
-
- -- Paul Buetow <paul@buetow.org>  Sun, 02 Mar 2014 13:57:38 +0100
-
-guprecords (0.1.3) stable; urgency=low
-
-  * Fix version string in manpage
-
- -- Paul Buetow <paul@buetow.org>  Sun, 02 Mar 2014 13:45:34 +0100
-
-guprecords (0.1.2) stable; urgency=low
-
-  * Sign the packages
-
- -- Paul Buetow <paul@buetow.org>  Sun, 02 Mar 2014 13:40:29 +0100
-
-guprecords (0.1.1) stable; urgency=low
-
-  * Fix the version string
-
- -- Paul Buetow <paul@buetow.org>  Sun, 02 Mar 2014 13:39:17 +0100
-
-guprecords (0.1.0) stable; urgency=low
-
-  * Initial release
-
- -- Paul Buetow <paul@buetow.org>  Sun, 02 Mar 2014 13:32:05 +0100
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 45a4fb7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 3e0e59b..0000000
--- a/debian/control
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: guprecords
-Section: utils
-Priority: optional
-Maintainer: Paul Buetow <paul@buetow.org>
-Build-Depends: 
-Standards-Version: 3.9.2
-Homepage: https://guprecords.buetow.org
-Vcs-Git: https://github.com/buetow/guprecords.git
-Vcs-Browser: https://github.com/buetow/guprecords
-
-Package: guprecords
-Architecture: all
-Depends:
-Description: Shows uprecords of several hosts
- A tool to show global uprecord stats collected on several hosts using uptimed.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 2879d80..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,30 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: guprecords
-Source: http://guprecords.buetow.org
-
-Files: *
-Copyright: 2014 Paul Buetow <paul@buetow.org>
-License: GPL-3.0+
-
-Files: debian/*
-Copyright: 2014 Paul Buetow <paul@buetow.org>
-License: GPL-3.0+
-
-License: GPL-3.0+
- 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 3 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 3 can be found in "/usr/share/common-licenses/GPL-3".
-
-
diff --git a/debian/files b/debian/files
deleted file mode 100644
index e323e14..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-guprecords_0.2.2_all.deb utils optional
diff --git a/debian/guprecords.manpages b/debian/guprecords.manpages
deleted file mode 100644
index ad209b1..0000000
--- a/debian/guprecords.manpages
+++ /dev/null
@@ -1 +0,0 @@
-docs/guprecords.1
diff --git a/debian/guprecords.substvars b/debian/guprecords.substvars
deleted file mode 100644
index bcb0957..0000000
--- a/debian/guprecords.substvars
+++ /dev/null
@@ -1,2 +0,0 @@
-perl:Depends=perl
-misc:Depends=
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index b760bee..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
-	dh $@ 
diff --git a/docs/guprecords.1 b/docs/guprecords.1
index c205e13..ce69da5 100644
--- a/docs/guprecords.1
+++ b/docs/guprecords.1
@@ -192,4 +192,4 @@ You may automate the collecting of all the uprecords using something like cron o
 See package description or project website.
 .SH "AUTHOR"
 .IX Header "AUTHOR"
-Paul Buetow \- <http://guprecords.buetow.org>
+Paul Buetow \- <http://buetow.org>
diff --git a/docs/guprecords.pod b/docs/guprecords.pod
index 07e94fa..d021ea3 100644
--- a/docs/guprecords.pod
+++ b/docs/guprecords.pod
@@ -77,6 +77,6 @@ See package description or project website.
 
 =head1 AUTHOR
 
-Paul Buetow - <http://guprecords.buetow.org>
+Paul Buetow - <http://buetow.org>
 
 =cut
diff --git a/docs/guprecords.txt b/docs/guprecords.txt
index dac01a6..c15a6b4 100644
--- a/docs/guprecords.txt
+++ b/docs/guprecords.txt
@@ -55,5 +55,5 @@ LICENSE
     See package description or project website.
 
 AUTHOR
-    Paul Buetow - <http://guprecords.buetow.org>
+    Paul Buetow - <http://buetow.org>
 
diff --git a/src/guprecords b/src/guprecords
index 882d6f0..3722470 100755
--- a/src/guprecords
+++ b/src/guprecords
@@ -1,6 +1,7 @@
 #!/usr/bin/env perl
-# guprecords (c) 2014, 2015 Paul Buetow
-# E-Mail: guprecords@mx.buetow.org WWW: http://guprecords.buetow.org
+
+# guprecords (c) 2014, Paul Buetow
+# E-Mail: guprecords@mx.buetow.org WWW: http://codeberg.org/snonux/guprecords
 
 use strict;
 use warnings;