summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Swanson2015-08-21 02:08:38 -0700
committerMike Swanson2015-08-21 02:08:38 -0700
commit205411dc7b976322be1bc1a227eb508fe2990697 (patch)
treec96137ea604792963f0ec6efd19cd50e947c24be
parent1db820a2fb0e031a3b6e74580bebab797426b9c5 (diff)
downloadaur-205411dc7b976322be1bc1a227eb508fe2990697.tar.gz
Update to 1.2
-rw-r--r--.SRCINFO12
-rw-r--r--0001-Makefile-Sanitize-the-install-and-uninstall-targets.patch4
-rw-r--r--0002-Correct-the-order-of-git-am-arguments.patch25
-rw-r--r--PKGBUILD12
4 files changed, 12 insertions, 41 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5da269329cd..b081880c0f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,16 @@
pkgbase = git-debubble
pkgdesc = Clean up merge bubbles in a Git repository
- pkgver = 1.1
- pkgrel = 3
+ pkgver = 1.2
+ pkgrel = 1
url = http://www.catb.org/esr/git-debubble/
arch = any
license = GPL2
makedepends = asciidoc
depends = git
- source = http://www.catb.org/esr/git-debubble/git-debubble-1.1.tar.gz
+ source = http://www.catb.org/esr/git-debubble/git-debubble-1.2.tar.gz
source = 0001-Makefile-Sanitize-the-install-and-uninstall-targets.patch
- source = 0002-Correct-the-order-of-git-am-arguments.patch
- sha256sums = 6b2cd99cea708a06b96068eedaa402ce61a50870cd734e446055312da031b6ef
- sha256sums = 2f9440937cb6fa2b4a2b19c2b2964dfe3569bd05560023ff02d5e678890b025f
- sha256sums = 528aa930db8bf9864a2c320a5cd9a8ac212128652946fa2cea90916b0ac1b8d7
+ sha256sums = 59ea9a3ba342ce690134f99444eb5bda6b7db19cf5ec02556cb52b02625d0a9f
+ sha256sums = f68b95013f34e9d10716bb61f5343c054fdda269a7f61229fbd52fcc0c624511
pkgname = git-debubble
diff --git a/0001-Makefile-Sanitize-the-install-and-uninstall-targets.patch b/0001-Makefile-Sanitize-the-install-and-uninstall-targets.patch
index 94444cfb76a..4f55afb7231 100644
--- a/0001-Makefile-Sanitize-the-install-and-uninstall-targets.patch
+++ b/0001-Makefile-Sanitize-the-install-and-uninstall-targets.patch
@@ -1,7 +1,7 @@
-From 7761604bd39ff77356a9142caef1577f2046bde5 Mon Sep 17 00:00:00 2001
+From b3258a6f48e58e781659ea5ec26efad2bad2f29f Mon Sep 17 00:00:00 2001
From: Mike Swanson <mikeonthecomputer@gmail.com>
Date: Wed, 5 Aug 2015 00:56:30 -0700
-Subject: [PATCH 1/2] Makefile: Sanitize the install and uninstall targets
+Subject: [PATCH] Makefile: Sanitize the install and uninstall targets
install shouldn't really depend on uninstall; it interferes with
packaging (especially when doing things as a non-root user). Also,
diff --git a/0002-Correct-the-order-of-git-am-arguments.patch b/0002-Correct-the-order-of-git-am-arguments.patch
deleted file mode 100644
index 4c123b0c9ce..00000000000
--- a/0002-Correct-the-order-of-git-am-arguments.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 70e4efe848724d88d87973535ac5cc4969ad868e Mon Sep 17 00:00:00 2001
-From: Mike Swanson <mikeonthecomputer@gmail.com>
-Date: Wed, 5 Aug 2015 00:59:09 -0700
-Subject: [PATCH 2/2] Correct the order of git-am arguments
-
----
- git-debubble | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/git-debubble b/git-debubble
-index 26c3537..6d836a6 100755
---- a/git-debubble
-+++ b/git-debubble
-@@ -38,7 +38,7 @@ case $mode in
- if git branch $debubbled; then
- git checkout master
- git checkout $debubbled
-- if git --committer-date-is-author-date am 0*; then
-+ if git am --committer-date-is-author-date 0*; then
- rm 0*
- if git branch --move $head $bubbled; then
- if git branch --move $debubbled $head; then
---
-2.5.0
-
diff --git a/PKGBUILD b/PKGBUILD
index a7f563c37b2..a54a6b52d70 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
pkgname=git-debubble
-pkgver=1.1
-pkgrel=3
+pkgver=1.2
+pkgrel=1
pkgdesc="Clean up merge bubbles in a Git repository"
arch=('any')
depends=('git')
@@ -10,11 +10,9 @@ makedepends=('asciidoc')
url="http://www.catb.org/esr/$pkgname/"
license=('GPL2')
source=("http://www.catb.org/esr/$pkgname/$pkgname-$pkgver.tar.gz"
- 0001-Makefile-Sanitize-the-install-and-uninstall-targets.patch
- 0002-Correct-the-order-of-git-am-arguments.patch)
-sha256sums=('6b2cd99cea708a06b96068eedaa402ce61a50870cd734e446055312da031b6ef'
- '2f9440937cb6fa2b4a2b19c2b2964dfe3569bd05560023ff02d5e678890b025f'
- '528aa930db8bf9864a2c320a5cd9a8ac212128652946fa2cea90916b0ac1b8d7')
+ 0001-Makefile-Sanitize-the-install-and-uninstall-targets.patch)
+sha256sums=('59ea9a3ba342ce690134f99444eb5bda6b7db19cf5ec02556cb52b02625d0a9f'
+ 'f68b95013f34e9d10716bb61f5343c054fdda269a7f61229fbd52fcc0c624511')
prepare() {
cd "$pkgname-$pkgver"