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

Re: RFS: vpim -- Ruby support for vCard and iCalendar [NMU]



On Tue, May 24, 2016 at 09:00:50AM -0300, Herbert Fortes wrote:
> Olá,
> 
> Pedido de sponsor para o pacote Vpim - fecha bug RC[0]
> 
> [0] - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800195

note que normalmente, refazer todo o empacotamento como parte de um NMU não é
uma prática muito recomendada. nesse caso eu vou fazer vista grossa porquê o
pacote está claramente abandonado (esse sendo o quarto NMU seguido) ...

comentários sobre o debdiff entre a sua versão e a versão no repositório
...

> diff -Nru vpim-0.695/debian/changelog vpim-0.695/debian/changelog
> --- vpim-0.695/debian/changelog	2016-05-24 10:37:09.000000000 -0300
> +++ vpim-0.695/debian/changelog	2016-05-23 16:50:14.000000000 -0300
> @@ -1,3 +1,27 @@
> +vpim (0.695-1.4) unstable; urgency=medium
> +
> +  * Non-maintainer upload.
> +  * DH_LEVEL: 9. (Closes: #800195)
> +  * debian/control:
> +      - dh-exec added to Build-Depends.
> +      - Bump Standards-Version from 3.8.0 to 3.9.8
> +      - some fields were reorganized.
> +      - using ${misc:Depends}.
> +  * debian/docs created.
> +  * debian/install created.

num changelog e em mensagens de commit, eu espero que me seja dito não só o quê
foi feito, mas também, e talvez mais importante, _por quê_.

> +  * debian/patches ( 3.0 - quilt):
> +      - ported the existing patches to:
> +          - event_size.patch
> +          - path_to_plist.patch

não é muito óbvio o que exatamente você quer dizer aqui, eu só entendi depois
que eu li o diff. diga explicitamente o que você fez, que foi transformar um
diff único em patches individuais.

> +  * debian/post{inst,rm}
> +      - 'set -e' added.
> +      - '#DEBHELPER#' token added.
> +      - 'exit 0' added.
> +  * debian/rules:
> +      - new format. 
> +
> + -- Herbert Parentes Fortes Neto <hpfn@ig.com.br>  Mon, 23 May 2016 15:13:52 -0300
> +
>  vpim (0.695-1.3) unstable; urgency=medium
>  
>    * Non-maintainer upload.
[...]
> diff -Nru vpim-0.695/debian/install vpim-0.695/debian/install
> --- vpim-0.695/debian/install	1969-12-31 21:00:00.000000000 -0300
> +++ vpim-0.695/debian/install	2016-05-23 15:40:17.000000000 -0300
> @@ -0,0 +1,11 @@
> +#!/usr/bin/dh-exec
> +samples/cmd-itip.rb => /usr/bin/itip
> +samples/mutt-aliases-to-vcf.rb => /usr/bin/mutt-aliases-to-vcf
> +samples/ics-dump.rb => /usr/bin/ics-dump
> +samples/ics-dump.rb => /usr/bin/ics-to-rss
> +samples/vcf-dump.rb => /usr/bin/vcf-dump
> +samples/vcf-to-ics.rb => /usr/bin/vcf-to-ics
> +samples/vcf-to-mutt.rb => /usr/bin/vcf-to-mutt
> +/usr/lib/ruby/vendor_ruby/vpim.rb
> +/usr/lib/ruby/vendor_ruby/vpim

os arquivos ruby deveriam ser instalados pelo dh_ruby e não aqui, veja mais
abaixo nos comentários sobre o debian/rules

> diff -Nru vpim-0.695/debian/rules vpim-0.695/debian/rules
> --- vpim-0.695/debian/rules	2016-05-24 10:37:09.000000000 -0300
> +++ vpim-0.695/debian/rules	2016-05-23 15:45:46.000000000 -0300
> @@ -1,117 +1,22 @@
>  #! /usr/bin/make -f
>  
> -#   Copyright 1994-99,2001,2008,9   joey@infodrom.org (Joey Schulze)
> -#
> -#   This program is free software; you can redistribute it and/or modify
> -#   it under the terms of the GNU General Public License as published by
> -#   the Free Software Foundation; version 2 dated June, 1991.
> -#
> -#   This program is distributed in the hope that it will be useful,
> -#   but WITHOUT ANY WARRANTY; without even the implied warranty of
> -#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> -#   GNU General Public License for more details.
> -#
> -#   You should have received a copy of the GNU General Public License
> -#   along with this program;  if not, write to the Free Software
> -#   Foundation Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
> -
> -SHELL=/bin/bash
> -
> -# The name and version of the source
> -#
> -source = $(shell grep "^Source: " debian/control|head -1|sed 's/Source: \(.*\)/\1/g')
> -package = $(shell grep "^Package: " debian/control|head -1|sed 's/Package: \(.*\)/\1/g')
> -version = $(shell grep "^$(source) " debian/changelog|head -1 |sed 's/.*(\(.*\)\-[^\-]*).*/\1/g')
> -revision = $(shell grep "^$(source) " debian/changelog|head -1 |sed 's/.*([^\-]*\-\(.*\)).*/\1/g')
> +export DH_VERBOSE = 1
>  
> -installbin = install -g root -o root -m 755
> -installdoc = install -g root -o root -m 644
> +export DH_RUBY_IGNORE_TESTS=require-rubygems
> +export DH_RUBY_USE_DH_AUTO_INSTALL_DESTDIR=yes
> +
> +%:
> +	dh $@
>  
> -build:
> +override_dh_auto_build:
>  	dh_ruby --setuprb --build
> -	touch stamp-build
>  
> -clean: debclean
> +override_dh_clean:
>  	dh_ruby --setuprb --clean
> -	rm -f debian/vpim.substvars
> -	rm -f stamp-build
> -
> -debclean:
> -# Cleans debian binary directories to allow binary creation
> -	rm -rf debian/tmp
> -	rm -f debian/{files,substvars}
> -
> -binary-arch:
> -# Nothing to be done here
> +	dh_clean
>  
> -export DH_RUBY_IGNORE_TESTS=require-rubygems
> -export DH_RUBY_USE_DH_AUTO_INSTALL_DESTDIR=yes
> -
> -binary-indep: debclean
> -	test -f stamp-build || $(MAKE) -f debian/rules build
> -	$(installbin) -d debian/tmp/DEBIAN
> -	chown -R root.root debian/tmp
> -	chmod -R g-ws debian/tmp
> -	$(installbin) -d debian/tmp/usr/share/doc/$(package)
> -	$(installbin) debian/{postinst,postrm} debian/tmp/DEBIAN/
> -#	$(installdoc) debian/conffiles debian/tmp/DEBIAN/
> -	$(installdoc) debian/changelog debian/tmp/usr/share/doc/$(package)/changelog.Debian
> -	$(installdoc) debian/copyright debian/tmp/usr/share/doc/$(package)/
> -	$(installdoc) debian/README.Debian debian/tmp/usr/share/doc/$(package)/
> -	#
> +override_dh_auto_install:
>  	dh_ruby --setuprb --install debian/tmp
> -	$(installdoc) CHANGES debian/tmp/usr/share/doc/$(package)/changelog
> -	$(installdoc) samples/README.mutt debian/tmp/usr/share/doc/$(package)/
> -	$(installdoc) README debian/tmp/usr/share/doc/$(package)/
> -	#
> -	$(installbin) -d debian/tmp/usr/bin
> -	$(installbin) samples/cmd-itip.rb debian/tmp/usr/bin/itip
> -	$(installbin) samples/mutt-aliases-to-vcf.rb debian/tmp/usr/bin/mutt-aliases-to-vcf
> -	$(installbin) samples/ics-dump.rb debian/tmp/usr/bin/ics-dump
> -	$(installbin) samples/ics-to-rss.rb debian/tmp/usr/bin/ics-to-rss
> -	$(installbin) samples/vcf-dump.rb debian/tmp/usr/bin/vcf-dump
> -	$(installbin) samples/vcf-to-ics.rb debian/tmp/usr/bin/vcf-to-ics
> -	$(installbin) samples/vcf-to-mutt.rb debian/tmp/usr/bin/vcf-to-mutt
> -	#
> -	$(installbin) -d debian/tmp/usr/lib/mime/packages
> -	$(installdoc) debian/mailcap debian/tmp/usr/lib/mime/packages/$(package)
> -	#
> -	gzip -9f debian/tmp/usr/share/doc/$(package)/changelog{,.Debian}
> -	#
> -	rm debian/tmp/usr/lib/ruby/*/plist.rb
> -	rm debian/tmp/usr/lib/ruby/*/atom.rb
> -	#
> -#	$(installbin) -d debian/tmp/usr/share/man/man{5,8}
> -#	$(installdoc) syslog.conf.5 debian/tmp/usr/share/man/man5
> -#	$(installdoc) {sysklogd,syslogd,klogd,debian/syslogd-listfiles}.8 debian/tmp/usr/share/man/man8
> -#	$(installdoc) syslog-facility.8 debian/tmp/usr/share/man/man8
> -#	gzip -9 debian/tmp/usr/share/man/man?/*
> -	#
> -	dpkg-gencontrol -isp
> -	dpkg --build debian/tmp ..
> -
> -binary: binary-indep binary-arch
> -
> -source diff:
> -	@echo >&2 'source and diff are obsolete - use dpkg-source -b' or dsc; false
> -
> -dsc:
> -	-test -d debian/tmp && $(MAKE) -f debian/rules clean
> -	if [ ! -f ../$(source)_$(version).orig.tar.gz -a -f ../orig/$(source)_$(version).orig.tar.gz ]; \
> -	then \
> -	  ln -s orig/$(source)_$(version).orig.tar.gz ../$(source)_$(version).orig.tar.gz; \
> -	  touch /tmp/stamp-$(source)-link; \
> -	fi; \
> -	cd .. && dpkg-source -b $(source)-$(version)
> -	if [ -f /tmp/stamp-$(source)-link ]; then \
> -	  rm ../$(source)_$(version).orig.tar.gz /tmp/stamp-$(source)-link; \
> -	fi
> -
> -checkroot:
> -	$(checkdir)
> -	test root = "`whoami`"
> -
> -dist: binary dsc
> -
> -.PHONY: binary binary-arch binary-indep clean checkroot
>  
> +override_dh_installchangelogs:
> +	dh_installchangelogs CHANGES

na prática o que você quer fazer é transformar esse pacote num pacote ruby de
verdade, e nesse caso você pode trocar todo o debian/rules por isso aqui:

----------------8<----------------8<----------------8<-----------------
#! /usr/bin/make -f

export DH_VERBOSE = 1

%:
	dh $@ --buildsystem=ruby --with ruby

override_dh_installchangelogs:
	dh_installchangelogs CHANGES
----------------8<----------------8<----------------8<-----------------


com isso você pode apagar as linhas do debian/install que menciona
/usr/lib/ruby/vendor_ruby/*

Attachment: signature.asc
Description: PGP signature


Reply to: