Skip to content

merge conflict #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mjhedu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

merge conflict #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ea216b
Git-Building
yeelengxiong Nov 30, 2017
3ee460a
gitbuild
yeelengxiong Nov 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion EliveUsersGuide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,32 @@ There are a few documentations that will help solve any problems we encounter du

# Debian Package Building



If using code management system (VCS) to maintain code, this merge and upstream patches a lot easier.

Requirement:
git-buildpackage: a suite to help with Debian packages in Git repositories.
Svn-buildpackage: helper programs to maintain Debian packages with Subversion.
cvs-buildpackage: a set of Debian package scripts for CVS source trees.
This makes merging and cherry-picking upstream patches easier.
Git-build-packages is becoming poplar for developers to manage Debian.

Structure:
main: for Debian package source tree.
Upstream: for upstream source tree.
Pristine-tar: for upstream tarball generated by the –pristine-tar option.

Formatting:
Theses commands automate packing activites
git-import-dsc(1): import a previous Debian package to a Git repository.
git-import-orig(1): import a new upstream tar to a Git repository.
git-dch(1): generate: the Debian changelog from Git commit messages.
git-buildpackage(1): build Debian packages from a Git repository.
git-pbuilder(1): build Debian packages from a Git repository using pbuilder/cowbuilder.

#This link below will show you what is new in the patches and what will be in the upcoming patches. http://alioth.debian.org/

## Workflow

1. Get a copy of the upstream software, usually in a compressed tar format.
Expand All @@ -88,7 +114,6 @@ There are a few documentations that will help solve any problems we encounter du

## Import Upstream


1. First, create the first version of a package, outside of Git. Once it done, you can import the package using the import-dsc command.

~~~shell
Expand Down