[Pkg-voip-commits] [pjproject] 22/45: Drop import script (gbp import-orig clashes with git-dpm patches). Document in README.source how to import new upstream source.
Jonas Smedegaard
dr at jones.dk
Tue Jun 7 22:01:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository pjproject.
commit 5779f846b262447b6fe7a57b1917473a6f57aae0
Author: Jonas Smedegaard <dr at jones.dk>
Date: Tue Jun 7 14:57:49 2016 +0200
Drop import script (gbp import-orig clashes with git-dpm patches). Document in README.source how to import new upstream source.
---
debian/README.source | 6 ++++++
debian/import | 14 --------------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index 183d4c1..7b1bd71 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -12,6 +12,12 @@ Quick notes:
debuild -I
+* To upgrade to newer upstream source, use:
+
+ uscan
+
+ git-dpm import-new-upstream --ptc --rebase ../new-stuff.orig.tar.gz
+
* To update the patches in the packaging branch, use:
git-dpm checkout-patched
diff --git a/debian/import b/debian/import
deleted file mode 100755
index 04765c6..0000000
--- a/debian/import
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# A script to import the orig tarball while tripping non-distributable
-# bits
-
-exec git import-orig \
- --filter=pjmedia/src/pjmedia-audiodev/s60_g729_bitstream.h \
- --filter=third_party/g7221 \
- --filter=third_party/ilbc \
- --filter=third_party/milenage \
- --filter=third_party/BaseClasses \
- --pristine-tar \
- --filter-pristine-tar \
- "$@"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git
More information about the Pkg-voip-commits
mailing list