summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRong Jinhui <jinhui.rong@samsung.com>2015-10-13 16:14:14 +0800
committerRong Jinhui <jinhui.rong@samsung.com>2015-10-13 17:22:53 +0800
commitfbdc1ccd9b3e6f6dc9dd6d32951000659980a4c0 (patch)
treed07dd3dcdc08b9f2261e11b1f92790c5e89e7f19
parent4b470ddb487cbd5013b085458a2862c252ef288a (diff)
downloadpristine-tar-fbdc1ccd9b3e6f6dc9dd6d32951000659980a4c0.tar.gz
pristine-tar-fbdc1ccd9b3e6f6dc9dd6d32951000659980a4c0.tar.bz2
pristine-tar-fbdc1ccd9b3e6f6dc9dd6d32951000659980a4c0.zip
Fix 'debian/changelog' file.tizen/1.33-20150212
Change-Id: I888b08eedc3c8902b54959bdb3dade94e9085690 Signed-off-by: Rong Jinhui <jinhui.rong@samsung.com>
-rw-r--r--debian/changelog2
-rw-r--r--packaging/pristine-tar.spec4
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 059220c..bfbf358 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pristine-tar (1.33) unstable; urgency=low
+pristine-tar (1.33-tizen20150212) unstable; urgency=low
* Version bump to 1.33
diff --git a/packaging/pristine-tar.spec b/packaging/pristine-tar.spec
index ab33df5..cc15d7e 100644
--- a/packaging/pristine-tar.spec
+++ b/packaging/pristine-tar.spec
@@ -12,7 +12,7 @@ Patch1: 0002-openSUSE-HACK-add-upstream-bzip2-v1.0.6-sources.patch
Patch2: 0003-openSUSE-HACK-modify-Makefile-in-upstream-bzip2.patch
Patch3: 0004-openSUSE-HACK-enable-special-upstream-bzip2.patch
Patch4: 0005-pristine-gz-obey-the-XDELTA_PROGRAM-build-parameter.patch
-Patch5: 0006-Add-.gbp.conf.patch
+#Patch5: 0006-Add-.gbp.conf.patch
Patch6: 0007-Use-posix-tar-format-by-default.patch
Patch7: 0008-Mangle-PAX-headers-when-using-posix-tar-format.patch
Patch8: 0009-HACK-workaround-for-some-broken-pristine-tar-branche.patch
@@ -84,7 +84,7 @@ control.
# 0005-pristine-gz-obey-the-XDELTA_PROGRAM-build-parameter.patch
%patch4 -p1
# 0006-Add-.gbp.conf.patch
-%patch5 -p1
+#%patch5 -p1
# 0007-Use-posix-tar-format-by-default.patch
%patch6 -p1
# 0008-Mangle-PAX-headers-when-using-posix-tar-format.patch