Package: git
Version: 1:2.1.3-1.1
Followup-For: Bug #773245
Add a changelog entry to the patch.
-- System Information:
Debian Release: 7.7
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-4-amd64 (SMP w/6 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages git depends on:
ii git-man 1:2.1.3-1.1
ii libc6 2.13-38+deb7u6
ii libcurl3-gnutls 7.26.0-1+wheezy11
ii liberror-perl 0.17-1
ii libexpat1 2.1.0-1+deb7u1
ii libpcre3 1:8.30-5
ii perl-modules 5.14.2-21+deb7u2
ii zlib1g 1:1.2.7.dfsg-13
Versions of packages git recommends:
ii less 444-4
ii openssh-client [ssh-client] 1:6.0p1-4+deb7u2
ii patch 2.6.1-3
ii rsync 3.0.9-4
Versions of packages git suggests:
ii gettext-base 0.18.1.1-9
pn git-arch <none>
pn git-cvs <none>
pn git-daemon-run | git-daemon-sysvinit <none>
pn git-doc <none>
pn git-el <none>
pn git-email <none>
pn git-gui <none>
pn git-mediawiki <none>
ii git-p4 1:2.1.3-1.1
ii git-svn 1:2.1.3-1.1
pn gitk <none>
pn gitweb <none>
-- no debconf information
>From c5387511db182f6701ed3785872c93aaf7209715 Mon Sep 17 00:00:00 2001
From: Luke Diamand <l...@diamand.org>
Date: Mon, 15 Dec 2014 22:26:38 +0000
Subject: [PATCH] debian: add git-p4 package
Provide git-p4 package in contrib, so Perforce users
don't have to copy the git-p4.py script around manually.
Signed-off-by: Luke Diamand <l...@diamand.org>
---
debian/changelog | 6 ++++++
debian/control | 26 +++++++++++++++++++++++++-
debian/rules | 7 ++++---
3 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 49634f9..387b89e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git (1:2.1.3-1.2) unstable; urgency=low
+
+ * Add git-p4 sub-package.
+
+ -- Luke Diamand <l...@diamand.org> Mon, 15 Dec 2014 23:06:45 +0000
+
git (1:2.1.3-1.1) unstable; urgency=low
* correct spelling of Roland Mas's name in the 1:2.1.3-1 changelog
diff --git a/debian/control b/debian/control
index 275863a..721f53f 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Depends: ${shlibs:Depends}, perl-modules, liberror-perl,
Recommends: patch, less, rsync, ssh-client
Suggests: gettext-base, git-daemon-run | git-daemon-sysvinit,
git-doc, git-el, git-email, git-gui, gitk, gitweb,
- git-arch, git-cvs, git-mediawiki, git-svn
+ git-arch, git-cvs, git-mediawiki, git-svn, git-p4
Replaces: gitweb (<< 1:1.7.4~rc1),
git-core (<< 1:1.7.0.4-1.)
Breaks: bash-completion (<< 1:1.90-1), gitweb (<< 1:1.7.4~rc1),
@@ -353,6 +353,29 @@ Description: fast, scalable, distributed revision control system (web interface)
If libcgi-fast-perl is installed, gitweb can also be run over FastCGI
(and served by nginx, for example).
+Package: git-p4
+Architecture: all
+Multi-Arch: foreign
+Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.),
+ python (>=2.7)
+Section: contrib/devel
+Priority: extra
+Description: fast, scalable, distributed revision control system (web interface)
+ Git is popular version control system designed to handle very large
+ projects with speed and efficiency; it is used for many high profile
+ open source projects, most notably the Linux kernel.
+ .
+ Git falls in the category of distributed source code management tools.
+ Every Git working directory is a full-fledged repository with full
+ revision tracking capabilities, not dependent on network access or a
+ central server.
+ .
+ This package provides a way to interact with Perforce repositories using Git.
+ Create new Git repositories using "git p4 clone", incorporate new Perforce
+ changes with "git p4 sync", and submit changes from Git to Perforce using
+ "git p4 submit".
+ It requires installation of the proprietary Perforce command line client, p4.
+
Package: git-all
Architecture: all
Multi-Arch: foreign
@@ -360,6 +383,7 @@ Depends: git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}
git-doc, git-el, git-arch, git-cvs, git-mediawiki, git-svn,
git-email, git-gui, gitk, gitweb
Recommends: git-daemon-run | git-daemon-sysvinit
+Suggests: git-p4
Description: fast, scalable, distributed revision control system (all subpackages)
Git is popular version control system designed to handle very large
projects with speed and efficiency; it is used for many high profile
diff --git a/debian/rules b/debian/rules
index 00aadb7..afb511a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,7 @@ PKG_INDEP += git-doc
PKG_INDEP += git-arch
PKG_INDEP += git-cvs
PKG_INDEP += git-svn
+PKG_INDEP += git-p4
PKG_INDEP += git-mediawiki
PKG_INDEP += git-daemon-run
PKG_INDEP += git-daemon-sysvinit
@@ -66,7 +67,7 @@ build-arch-stamp: patch-stamp
-$(CC) -v
DESTDIR='$(GIT)' $(MAKE) all $(OPTS)
DESTDIR='$(GIT)' $(MAKE) -C contrib/subtree all $(OPTS)
- ln -s contrib/subtree/git-subtree
+ ln -sf contrib/subtree/git-subtree
test -z '$(TEST)' || \
DESTDIR='$(GIT)' $(MAKE) $(TEST) $(OPTS) || \
GIT_TEST_OPTS=--verbose DESTDIR='$(GIT)' $(MAKE) $(TEST) $(OPTS)
@@ -211,8 +212,8 @@ install-indep: build-arch-stamp build-indep-stamp
rm -f '$(TMP)'/html/git-p4.*
install -d -m0755 '$(GIT)'-doc/usr/share/doc/git
ln -s ../git-doc '$(GIT)'-doc/usr/share/doc/git/html
- # git-cvs, git-svn
- for i in cvs svn; do \
+ # git-cvs, git-svn, git-p4
+ for i in cvs svn p4; do \
rm -rf '$(GIT)'-$$i && \
install -d -m0755 '$(GIT)'-$$i/usr/lib/git-core && \
install -m0755 '$(TMP)'/usr/lib/git-core/git-$$i* \
--
2.1.3.1037.g95a6691.dirty
