[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

New packages on Debian/Ubuntu printing stack

[ CCing also Didier Raboud directly as mail can be too long for the
  list. ]

Hi,
due to the Feature Freeze on Ubuntu on next Thursday, Feb 18, I have updated the Debian GIT repos of CUPS (2.1.3) and cups-filters (1.8.2). They are ready to upload, can you upload them, so that they auto-sync before our Feature Freeze? Thanks.
I have also tried with HPLIP, see what I have done below. Unfortunately, this did not work out, as during repack EVERY SINGLE file conflicted. Can you do the update (to HPLIP 3.16.2) and upload it, so that it also auto-syncs before our Feature Freeze and also tell me what I have done wrong? 

Thanks in advance.

   Till


----------
till@till-x1carbon:~/ubuntu/hplip/git$ git clone https://anonscm.debian.org/git/printing/hplip.git 
Cloning into 'hplip'...
remote: Counting objects: 120130, done.
remote: Compressing objects: 100% (34269/34269), done.
remote: Total 120130 (delta 85678), reused 119969 (delta 85518)
Receiving objects: 100% (120130/120130), 199.88 MiB | 7.46 MiB/s, done.
Resolving deltas: 100% (85678/85678), done.
Checking connectivity... done.
warning: remote HEAD refers to nonexistent ref, unable to checkout.

till@till-x1carbon:~/ubuntu/hplip/git$ cd hplip/
till@till-x1carbon:~/ubuntu/hplip/git/hplip$ git branch -r
  origin/debian/master
  origin/pristine-tar
  origin/upstream/latest
  origin/upstream/latest-repack
till@till-x1carbon:~/ubuntu/hplip/git/hplip$ git checkout --track -b debian/master origin/debian/master Branch debian/master set up to track remote branch debian/master from origin. 
Switched to a new branch 'debian/master'
till@till-x1carbon:~/ubuntu/hplip/git/hplip$ git checkout --track -b upstream/latest origin/upstream/latest Branch upstream/latest set up to track remote branch upstream/latest from origin. 
Switched to a new branch 'upstream/latest'
till@till-x1carbon:~/ubuntu/hplip/git/hplip$ git checkout --track -b upstream/latest-repack origin/upstream/latest-repack Branch upstream/latest-repack set up to track remote branch upstream/latest-repack from origin. 
Switched to a new branch 'upstream/latest-repack'
till@till-x1carbon:~/ubuntu/hplip/git/hplip$ git checkout --track -b pristine-tar origin/pristine-tar 
Branch pristine-tar set up to track remote branch pristine-tar from origin.
Switched to a new branch 'pristine-tar'
till@till-x1carbon:~/ubuntu/hplip/git/hplip$ git branch
  debian/master
* pristine-tar
  upstream/latest
  upstream/latest-repack
till@till-x1carbon:~/ubuntu/hplip/git/hplip$ git checkout debian/masterSwitched to branch 'debian/master' 
Your branch is up-to-date with 'origin/debian/master'.
till@till-x1carbon:~/ubuntu/hplip/git/hplip$ git branch
* debian/master
  pristine-tar
  upstream/latest
  upstream/latest-repack
till@till-x1carbon:~/ubuntu/hplip/git/hplip$ ./debian/rules get-orig-source
set -e;\
quilt pop -af || true ;\
rm -Rf .pc ;\
gbp import-orig --no-pristine-tar --no-merge --uscan --upstream-branch=upstream/latest;\ 
git checkout upstream/latest-repack ;\
utag=`git describe --exact-match heads/upstream/latest | sed -e 's#^upstream/##'` ;\ 
git merge --no-commit upstream/$utag ;\
find . -regextype posix-extended -iregex '.*\.(ldl|ppd|pdf|ps|pcl)\.gz' | xargs gunzip -f ;\ 
git add -A . ;\
git commit  -m "Merge upstream $utag version; un-gzip source files" ;\
urtag=$utag+repack0 ;\
git tag upstream/$urtag -m "Upstream repacked $utag version" ;\
git archive --format=tar --prefix=hplip-$urtag/ upstream/$urtag | xz -6e > ../hplip-modeswitch_$urtag.orig.tar.xz ;\ pristine-tar commit ../hplip-modeswitch_$urtag.orig.tar.xz upstream/$urtag ;\ 
git checkout debian/master ;\
git merge upstream/$urtag -m "Merge upstream-repacked $urtag version"
No patch removed
gbp:info: Launching uscan...
gbp:info: using ../hplip_3.16.2.orig.tar.gz
What is the upstream version? [3.16.2]
gbp:info: Importing '../hplip_3.16.2.orig.tar.gz' to branch 'upstream/latest'... 
gbp:info: Source package is hplip
gbp:info: Upstream version is 3.16.2
gbp:info: Successfully imported version 3.16.2 of ../hplip_3.16.2.orig.tar.gz 
Switched to branch 'upstream/latest-repack'
Your branch is up-to-date with 'origin/upstream/latest-repack'.
CONFLICT (modify/delete): prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-officejet_color_x555-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-officejet_color_x555-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-officejet_color_mfp_x585.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-officejet_color_mfp_x585.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-mopier_320-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-mopier_320-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-mopier_240-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-mopier_240-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_p3005-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_p3005-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_p3004-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_p3004-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_mfp_m630-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_mfp_m630-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m806-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m806-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m506-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m506-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz left in tree. CONFLICT (modify/delete): prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz left in tree. 

[...]
CONFLICT (modify/delete): fax/ppd/HP-Fax-hpcups.ppd.gz deleted in HEAD and modified in upstream/3.16.2. Version upstream/3.16.2 of fax/ppd/HP-Fax-hpcups.ppd.gz left in tree. 
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 1899 and retry the command. 
Automatic merge failed; fix conflicts and then commit the result.
debian/rules:469: recipe for target 'get-orig-source' failed
make: *** [get-orig-source] Error 1
till@till-x1carbon:~/ubuntu/hplip/git/hplip$
Reply to: