Hi,
Since git status was telling me that my netman branch was up to date
with oringin/master, I used git checkout to discard changes in the
working directory. git-buildpackage worked after that without issues.
Edward
On 23/12/2015, Edward Bartolo <edbarx@???> wrote:
> Hi Aitor,
>
> I used 'quilt refresh' but still I cannot use git-buildpackage
> successfully. This is what git is telling me. "--git-ignore-new" was
> my salvation to successfully build Debian package using git... I am
> stuck as long as I cannot successfully run git-buildpackage to create
> a .deb package.
>
> This is the output from git-buildpackage:
>
> edbarx@edbarx-pc:~/netman-0.1.1$ git-buildpackage
> --git-upstream-tree=0.1.1 --git-export-dir=../netman_pkg_build
> gbp:error: You have uncommitted changes in your source tree:
> gbp:error: On branch master
> Your branch is up-to-date with 'origin/master'.
> Changes to be committed:
> (use "git reset HEAD <file>..." to unstage)
>
> modified: debian/patches/rainer-autor-20.12.2015.patch
> modified: netman.lps
>
>
> gbp:error: Use --git-ignore-new to ignore.
> edbarx@edbarx-pc:~/netman-0.1.1$ git-buildpackage --git-upstream-tree=0.1.1
> gbp:error: You have uncommitted changes in your source tree:
> gbp:error: On branch master
> Your branch is up-to-date with 'origin/master'.
> Changes to be committed:
> (use "git reset HEAD <file>..." to unstage)
>
> modified: debian/patches/rainer-autor-20.12.2015.patch
> modified: netman.lps
>
>
> gbp:error: Use --git-ignore-new to ignore.
> edbarx@edbarx-pc:~/netman-0.1.1$ git-buildpackage
> gbp:error: You have uncommitted changes in your source tree:
> gbp:error: On branch master
> Your branch is up-to-date with 'origin/master'.
> Changes to be committed:
> (use "git reset HEAD <file>..." to unstage)
>
> modified: debian/patches/rainer-autor-20.12.2015.patch
> modified: netman.lps
>
>
> gbp:error: Use --git-ignore-new to ignore.
>
>
> What is holding me back? This is exaspirating when one wants to get things
> done.
>
> Edward
>
> On 23/12/2015, aitor_czr <aitor_czr@???> wrote:
>> Hi Edward,
>>
>> On 12/22/2015 06:39 PM, Edward Bartolo <edbarx@???> wrote:
>>> Hi All,
>>> >>
>>> >>By hook and by crook I have 'git pushed' my netman with Rainer's
>>> >> patch.
>>> >>
>>> >>My current objective is to successive build packages using git instead
>>> >>of dpkg-buildpackages as suggested by various helpful volunteers on
>>> >>this mailing list. I am using the command in the netman root
>>> >>directory:
>>> >>
>>> >>edbarx@edbarx-pc:~/netman_from_backup_08.12.2015$ git-buildpackage
>>> >>--git-export-dir=../netman_pkg_build --git-ignore-new
>>> >>
>>> >>git-buildpackage is rejecting to do what I tell it saying:
>>> >>gbp:error: upstream/0.1.1 is not a valid treeish
>>> >>
>>> >>I searched on google this error message and found on
>>> >>http://unix.stackexchange.com/questions that the debian/ subdirectory
>>> >>may be missing, but netman debian directory is there.
>>> >>
>>> >>Netman's tree:
>>> >>
>>> >>edbarx@edbarx-pc:~/netman_from_backup_08.12.2015$ tree
>>> >>.
>>> >>├── backend.pas
>>> >>├── backend_src
>>> >>│ ├── bin
>>> >>│ ├── include
>>> >>│ │ ├── automated_scanner.h
>>> >>│ │ ├── backend.h
>>> >>│ │ ├── caller.h
>>> >>│ │ ├── core_functions.h
>>> >>│ │ ├── essid_encoder.h
>>> >>│ │ ├── file_functions.h
>>> >>│ │ └── paths.h
>>> >>│ ├── Makefile
>>> >>│ ├── obj
>>> >>│ ├── README.md
>>> >>│ └── src
>>> >>│ ├── automated_scanner.c
>>> >>│ ├── backend
>>> >>│ ├── backend.c
>>> >>│ ├── caller.c
>>> >>│ ├── core_functions.c
>>> >>│ ├── essid_encoder.c
>>> >>│ └── file_functions.c
>>> >>├── backup
>>> >>├── common_functions.pas
>>> >>├── connect_info.lfm
>>> >>├── connect_info.pas
>>> >>├── debian
>>> >>│ ├── changelog
>>> >>│ ├── compat
>>> >>│ ├── control
>>> >>│ ├── copyright
>>> >>│ ├── docs
>>> >>│ ├── files
>>> >>│ ├── netman-backend
>>> >>│ │ ├── DEBIAN
>>> >>│ │ │ ├── control
>>> >>│ │ │ ├── md5sums
>>> >>│ │ │ └── postinst
>>> >>│ │ └── usr
>>> >>│ │ ├── lib
>>> >>│ │ │ └── netman
>>> >>│ │ │ └── bin
>>> >>│ │ │ └── backend
>>> >>│ │ └── share
>>> >>│ │ └── doc
>>> >>│ │ └── netman-backend
>>> >>│ │ ├── changelog.Debian.gz
>>> >>│ │ └── copyright
>>> >>│ ├── netman-backend.debhelper.log
>>> >>│ ├── netman-backend.install
>>> >>│ ├── netman-backend.postinst
>>> >>│ ├── netman-backend.substvars
>>> >>│ ├── netman-gui
>>> >>│ │ ├── DEBIAN
>>> >>│ │ │ ├── control
>>> >>│ │ │ ├── md5sums
>>> >>│ │ │ └── postinst
>>> >>│ │ └── usr
>>> >>│ │ ├── bin
>>> >>│ │ │ └── netman
>>> >>│ │ └── share
>>> >>│ │ ├── applications
>>> >>│ │ │ └── netman.desktop
>>> >>│ │ ├── doc
>>> >>│ │ │ └── netman-gui
>>> >>│ │ │ ├── changelog.Debian.gz
>>> >>│ │ │ ├── copyright
>>> >>│ │ │ ├── README.Debian
>>> >>│ │ │ └── README.gz
>>> >>│ │ └── pixmaps
>>> >>│ │ └── netman.ico
>>> >>│ ├── netman-gui.debhelper.log
>>> >>│ ├── netman-gui.install
>>> >>│ ├── netman-gui.postinst
>>> >>│ ├── netman-gui.substvars
>>> >>│ ├── netman.substvars
>>> >>│ ├── patches
>>> >>│ │ ├── rainer-autor-20.12.2015.patch
>>> >>│ │ └── series
>>> >>│ ├── README.Debian
>>> >>│ ├── README.source
>>> >>│ ├── rules
>>> >>│ ├── source
>>> >>│ │ ├── format
>>> >>│ │ └── include-binaries
>>> >>│ └── tmp
>>> >>│ ├── backend
>>> >>│ ├── netman
>>> >>│ ├── netman.desktop
>>> >>│ └── netman.ico
>>> >>├── formeditconnectprops.lfm
>>> >>├── formeditconnectprops.pas
>>> >>├── helpwndu.lfm
>>> >>├── helpwndu.pas
>>> >>├── lib
>>> >>│ └── x86_64-linux
>>> >>├── LICENSE
>>> >>├── mainform.lfm
>>> >>├── mainform.pas
>>> >>├── Makefile
>>> >>├── netman.desktop
>>> >>├── netman.ico
>>> >>├── netman_icons.lrs
>>> >>├── netman.lpi
>>> >>├── netman.lpr
>>> >>├── netman.lps
>>> >>├── netman.res
>>> >>├── network-transmit-receive.ico
>>> >>├── network-wired-disconnected.ico
>>> >>└── README
>>> >>
>>> >>30 directories, 80 files
>>> >>
>>
>> debian/tmp ???
>> debian/netman-backend/usr/lib/netman/bin/backend ???
>> debian/netman-gui/usr/bin/netman ???
>>
>> Are you using a clean repository? Your repository worked for me.
>>
>> Whitch is the content of your debian/changelog?
>>
>> One suggestion: don't use --git-ignore-new. Instead, unapply all the
>> quilt patches using 'quilt refresh'.
>>
>> Aitor.
>>
>
::
Re: [DNG] gbp:error: upstream/0.1.1…
