Replace contrib/debian/ with a note on how to install on Debian.
Since gitflow is packaged for Debian and is available for testing and
sid already, remove the contrib/ directory in favour of using the
official Debian package.
Also mention how to install gitflow on Debian in the README.mdown.
Furthermore, Debian-specific things were removed from Changes.mdown
and the Makefile.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
diff --git a/Changes.mdown b/Changes.mdown
index 53858b6..f38f90b 100644
--- a/Changes.mdown
+++ b/Changes.mdown
@@ -7,7 +7,7 @@
* Various minor bug fixes related to internal argument passing
-* Add package installers for the Debian and Windows platforms.
+* Add package installers for the Windows platform.
0.4.1:
-----
diff --git a/Makefile b/Makefile
index 764bd23..fbbfd2c 100644
--- a/Makefile
+++ b/Makefile
@@ -27,12 +27,7 @@
# policies, either expressed or implied, of Vincent Driessen.
#
-# Determine if we're inside a debian build ..
-ifdef DEB_BUILD_ARCH
- prefix=$(DESTDIR)/usr/
-else
- prefix=/usr/local
-endif
+prefix=/usr/local
# files that need mode 755
EXEC_FILES=git-flow
diff --git a/README.mdown b/README.mdown
index b3e1df3..aa9a6a2 100644
--- a/README.mdown
+++ b/README.mdown
@@ -36,6 +36,16 @@
$ wget --no-check-certificate -q -O - https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | sudo bash
+#### Debian
+
+Users of Debian testing and unstable can use the apt-get tool to
+install gitflow from the Debian repository:
+
+ $ apt-get install git-flow
+
+For Debian stable, one can either use the git flow installer, or the
+Debian package from unstable (it works just fine on stable too).
+
### Windows
For Windows users, [msysgit](http://code.google.com/p/msysgit/) is a good
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
deleted file mode 100644
index f889596..0000000
--- a/contrib/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-gitflow (0.4.1) unstable; urgency=low
-
- * Initial Debian Packaging
-
- -- Kiall Mac Innes <kiall@managedit.ie> Mon, 25 Apr 2011 23:51:42 +0100
diff --git a/contrib/debian/compat b/contrib/debian/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/contrib/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/contrib/debian/control b/contrib/debian/control
deleted file mode 100644
index d47b2b0..0000000
--- a/contrib/debian/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: gitflow
-Section: vcs
-Priority: optional
-Maintainer: Kiall Mac Innes <kiall@managedit.ie>
-Build-Depends: debhelper (>= 7.0.50~), git
-Standards-Version: 3.9.1
-Homepage: http://nvie.com/posts/a-successful-git-branching-model/
-Vcs-Git: https://github.com/nvie/gitflow.git
-Vcs-Browser: https://github.com/nvie/gitflow
-
-Package: gitflow
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, git
-Description: Git extensions to provide high-level repository operations for Vincent Driessen's branching model
diff --git a/contrib/debian/copyright b/contrib/debian/copyright
deleted file mode 100644
index a08359a..0000000
--- a/contrib/debian/copyright
+++ /dev/null
@@ -1,40 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: gitflow
-Source: <url://example.com>
-
-Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: BSD-3-Clause
-
-Files: debian/*
-Copyright: 2011 Kiall <kiall@managedit.ie>
-License: BSD-3-Clause
-
-License: BSD-3-Clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
diff --git a/contrib/debian/docs b/contrib/debian/docs
deleted file mode 100644
index ceda507..0000000
--- a/contrib/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.mdown
diff --git a/contrib/debian/rules b/contrib/debian/rules
deleted file mode 100755
index 79092d6..0000000
--- a/contrib/debian/rules
+++ /dev/null
@@ -1,16 +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
-
-override_dh_testdir:
- dh_testdir
- git submodule init && git submodule update
-%:
- dh $@