Skip to content
Browse files

Merge branch 'debian-installer' into develop

Conflicts:
	README.mdown
  • Loading branch information...
2 parents cc5e9a5 + 1b454cc commit ab7fda21f1009d8cc073fc9ae6152731f6bfee8a @nvie nvie committed Feb 14, 2012
Showing with 2 additions and 84 deletions.
  1. +1 −1 Changes.mdown
  2. +1 −6 Makefile
  3. +0 −5 contrib/debian/changelog
  4. +0 −1 contrib/debian/compat
  5. +0 −14 contrib/debian/control
  6. +0 −40 contrib/debian/copyright
  7. +0 −1 contrib/debian/docs
  8. +0 −16 contrib/debian/rules
View
2 Changes.mdown
@@ -17,7 +17,7 @@ Release date: **not yet**
* Better support for Windows and BSD users.
-* Add package installers for the Debian and Windows platforms.
+* Add package installer for the Windows platform.
0.4.1:
-----
View
7 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
View
5 contrib/debian/changelog
@@ -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
View
1 contrib/debian/compat
@@ -1 +0,0 @@
-7
View
14 contrib/debian/control
@@ -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
View
40 contrib/debian/copyright
@@ -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.
View
1 contrib/debian/docs
@@ -1 +0,0 @@
-README.mdown
View
16 contrib/debian/rules
@@ -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 $@

0 comments on commit ab7fda2

Please sign in to comment.
Something went wrong with that request. Please try again.