On Fri, Aug 01, 2008 at 06:49:33PM +0200, PICCA Frédéric-Emmanuel wrote: > I used cdbs as it reduce drasticaly the number of lines to put in the rules > files. > Less lines is less bugs :) (I hope)
I disagree there, changes are more prone to bugs and less lines hides the possible bugs in other "clever" packaging tool wrapper. :] > but maybe the new dh way of writing rules could do the job with even less > lines. > > do you know about this ? Nope, still sticking to debhepler which is straightforward and simple. > > Using "Architeture: !alpha !amd64 !ia64" does not work, I will do an > > upload fixing it. > > Ok so you will upload the package doing a fix for thoses arch. > do you plan to remove cdbs and reuse the plain dh stuffs ? Uploading to ftp-master (via ftp to ftp-master.debian.org): lisaac_0.13.1-2.dsc: done. lisaac_0.13.1-2.diff.gz: done. lisaac_0.13.1-2_powerpc.deb: done. lisaac-common_0.13.1-2_all.deb: done. lisaac-doc_0.13.1-2_all.deb: done. lisaac-mode_0.13.1-2_all.deb: done. lisaac_0.13.1-2_powerpc.changes: done. Successfully uploaded packages. > > However, the switching from dpatch to quilt is nice. > > > I will also downgrade lisaac-mode from Recommends to Suggests, as it > > pulls the whole emacs22 stuff by default for people who do not use it. > > Ok good > > PS: could we start working on the packaging by sending patch to the mailling > list so every of us could gives feedback ? Sure, when the new infrastructure on Alioth will be setup. In the mean time, I attached the debdiff to this bug report. Cheers, -- .''`. Aurélien GÉRÔME : :' : `. `'` Debian Developer `- Unix Sys & Net Admin
diff -Nru lisaac-0.13.1/debian/changelog lisaac-0.13.1/debian/changelog --- lisaac-0.13.1/debian/changelog 2008-08-02 09:57:03.000000000 +0200 +++ lisaac-0.13.1/debian/changelog 2008-08-02 09:57:03.000000000 +0200 @@ -1,3 +1,17 @@ +lisaac (1:0.13.1-2) unstable; urgency=low + + * Add myself to Uploaders with the team's agreement. + * Bump Standards-Version to 3.8.0. + * Switch to quilt. + * Add the DM-Upload-Allowed field for Xavier. + * Pass Debian CFLAGS to upstream Makefile. + * Move lisaac-mode from Recommends to Suggests for lisaac, + as not all people want the whole emacs stuff pulled by default. + * FTBFS with purpose on alpha, amd64, and ia64, + as upstream does not support 64-bit architectures yet. + + -- Aurélien GÉRÔME <[EMAIL PROTECTED]> Sat, 02 Aug 2008 09:45:45 +0200 + lisaac (1:0.13.1-1) unstable; urgency=low * New upstream release diff -Nru lisaac-0.13.1/debian/control lisaac-0.13.1/debian/control --- lisaac-0.13.1/debian/control 2008-08-02 09:57:03.000000000 +0200 +++ lisaac-0.13.1/debian/control 2008-08-02 09:57:03.000000000 +0200 @@ -2,15 +2,17 @@ Section: devel Priority: optional Maintainer: picca frederic <[EMAIL PROTECTED]> -Uploaders: Xavier Oswald <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.0), gcc (>= 4.1), dpatch, emacs22 | emacsen -Standards-Version: 3.7.3 +Uploaders: Xavier Oswald <[EMAIL PROTECTED]>, Aurélien GÉRÔME <[EMAIL PROTECTED]> +Build-Depends: debhelper (>= 5.0.0), gcc (>= 4.1), quilt, emacs22 | emacsen +Standards-Version: 3.8.0 Homepage: http://isaacproject.u-strasbg.fr/ +DM-Upload-Allowed: yes Package: lisaac Architecture: any Depends: ${shlibs:Depends}, lisaac-common, gcc(>= 4.1) -Recommends: lisaac-doc, lisaac-mode +Recommends: lisaac-doc +Suggests: lisaac-mode Description: Object-oriented language base on prototype Lisaac is a small prototype-based programming language. The ideas in Lisaac are mostly inspired by Smalltalk (all values are objects), Self diff -Nru lisaac-0.13.1/debian/patches/00list lisaac-0.13.1/debian/patches/00list --- lisaac-0.13.1/debian/patches/00list 2008-08-02 09:57:03.000000000 +0200 +++ lisaac-0.13.1/debian/patches/00list 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -05_Makefile diff -Nru lisaac-0.13.1/debian/patches/05_Makefile.dpatch lisaac-0.13.1/debian/patches/05_Makefile.dpatch --- lisaac-0.13.1/debian/patches/05_Makefile.dpatch 2008-08-02 09:57:03.000000000 +0200 +++ lisaac-0.13.1/debian/patches/05_Makefile.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 05_Makefile.dpatch by <[EMAIL PROTECTED]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - [EMAIL PROTECTED]@ -diff -urNad lisaac~/Makefile lisaac/Makefile ---- lisaac~/Makefile 2008-02-24 12:50:19.000000000 +0100 -+++ lisaac/Makefile 2008-02-24 12:51:01.000000000 +0100 -@@ -54,12 +54,13 @@ - # bug tracker system: https://gna.org/bugs/?func=additem&group=isaac - # mail to: Xavier Oswald <[EMAIL PROTECTED]> - --LIB=/usr/lib/lisaac -+LIB=/usr/share/lisaac - EXAMPLE=/examples - HTML=/html - BIN=/usr/bin - MAN=/usr/share/man/man1 --DOC=/usr/share/doc/lisaac -+DOC=/usr/share/doc/lisaac-doc -+EMACS=/usr/share/emacs/site-lisp/lisaac-mode - DESTDIR= - CC=gcc - CFLAGS=-O2 -@@ -81,23 +82,21 @@ - mkdir -p $(DESTDIR)$(MAN) - mkdir -p $(DESTDIR)$(DOC)$(HTML) - mkdir -p $(DESTDIR)$(DOC)$(EXAMPLE) -+ mkdir -p $(DESTDIR)$(EMACS) - cp bin/lisaac $(DESTDIR)$(BIN) - cp bin/shorter $(DESTDIR)$(BIN) - cp path.li $(DESTDIR)$(LIB) - cp -rf lib/ $(DESTDIR)$(LIB) - cp -rf lib_os/ $(DESTDIR)$(LIB) -+ cp -rf lib_html/* $(DESTDIR)$(DOC)$(HTML) - cp -rf example/* $(DESTDIR)$(DOC)$(EXAMPLE) -+ rm -rf $(DESTDIR)$(DOC)$(EXAMPLE)/shootout - cp -rf shorter/ $(DESTDIR)$(LIB) - cp -rf manpage/*.gz $(DESTDIR)$(MAN) -+ cp -f editor/emacs/lisaac-mode.el $(DESTDIR)$(EMACS) - #$(DESTDIR)$(BIN)/shorter -r -f html lib -o $(DESTDIR)$(DOC)$(HTML) - - clean: - rm -rf bin/lisaac - rm -rf bin/shorter - rm -rf bin/path.h -- rm -rf $(DESTDIR)$(BIN)/lisaac -- rm -rf $(DESTDIR)$(BIN)/shorter -- rm -rf $(DESTDIR)$(LIB) -- rm -rf $(DESTDIR)$(DOC) -- rm -rf $(DESTDIR)$(MAN)/lisaac.1.gz -- rm -rf $(DESTDIR)$(MAN)/shorter.1.gz diff -Nru lisaac-0.13.1/debian/patches/makefile.patch lisaac-0.13.1/debian/patches/makefile.patch --- lisaac-0.13.1/debian/patches/makefile.patch 1970-01-01 01:00:00.000000000 +0100 +++ lisaac-0.13.1/debian/patches/makefile.patch 2008-08-02 09:57:03.000000000 +0200 @@ -0,0 +1,48 @@ +Index: lisaac-0.13.1/Makefile +=================================================================== +--- lisaac-0.13.1.orig/Makefile 2008-08-02 09:38:49.000000000 +0200 ++++ lisaac-0.13.1/Makefile 2008-08-02 09:39:53.000000000 +0200 +@@ -54,12 +54,13 @@ + # bug tracker system: https://gna.org/bugs/?func=additem&group=isaac + # mail to: Xavier Oswald <[EMAIL PROTECTED]> + +-LIB=/usr/lib/lisaac ++LIB=/usr/share/lisaac + EXAMPLE=/examples + HTML=/html + BIN=/usr/bin + MAN=/usr/share/man/man1 +-DOC=/usr/share/doc/lisaac ++DOC=/usr/share/doc/lisaac-doc ++EMACS=/usr/share/emacs/site-lisp/lisaac-mode + DESTDIR= + CC=gcc + CFLAGS=-O2 +@@ -81,23 +82,21 @@ + mkdir -p $(DESTDIR)$(MAN) + mkdir -p $(DESTDIR)$(DOC)$(HTML) + mkdir -p $(DESTDIR)$(DOC)$(EXAMPLE) ++ mkdir -p $(DESTDIR)$(EMACS) + cp bin/lisaac $(DESTDIR)$(BIN) + cp bin/shorter $(DESTDIR)$(BIN) + cp path.li $(DESTDIR)$(LIB) + cp -rf lib/ $(DESTDIR)$(LIB) + cp -rf lib_os/ $(DESTDIR)$(LIB) ++ cp -rf lib_html/* $(DESTDIR)$(DOC)$(HTML) + cp -rf example/* $(DESTDIR)$(DOC)$(EXAMPLE) ++ rm -rf $(DESTDIR)$(DOC)$(EXAMPLE)/shootout + cp -rf shorter/ $(DESTDIR)$(LIB) + cp -rf manpage/*.gz $(DESTDIR)$(MAN) ++ cp -f editor/emacs/lisaac-mode.el $(DESTDIR)$(EMACS) + #$(DESTDIR)$(BIN)/shorter -r -f html lib -o $(DESTDIR)$(DOC)$(HTML) + + clean: + rm -rf bin/lisaac + rm -rf bin/shorter + rm -rf bin/path.h +- rm -rf $(DESTDIR)$(BIN)/lisaac +- rm -rf $(DESTDIR)$(BIN)/shorter +- rm -rf $(DESTDIR)$(LIB) +- rm -rf $(DESTDIR)$(DOC) +- rm -rf $(DESTDIR)$(MAN)/lisaac.1.gz +- rm -rf $(DESTDIR)$(MAN)/shorter.1.gz diff -Nru lisaac-0.13.1/debian/patches/series lisaac-0.13.1/debian/patches/series --- lisaac-0.13.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ lisaac-0.13.1/debian/patches/series 2008-08-02 09:57:03.000000000 +0200 @@ -0,0 +1 @@ +makefile.patch diff -Nru lisaac-0.13.1/debian/rules lisaac-0.13.1/debian/rules --- lisaac-0.13.1/debian/rules 2008-08-02 09:57:03.000000000 +0200 +++ lisaac-0.13.1/debian/rules 2008-08-02 09:57:03.000000000 +0200 @@ -1,5 +1,7 @@ #!/usr/bin/make -f +include /usr/share/quilt/quilt.make + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -20,7 +22,14 @@ build-arch: build-arch-stamp build-arch-stamp: configure-stamp - $(MAKE) +ifeq (,$(filter $(shell dpkg-architecture -qDEB_BUILD_ARCH), alpha amd64 ia64)) + $(MAKE) CFLAGS="$(CFLAGS)" +else + @echo "************************************************************************" >&2 + @echo "* Sorry, this package is not supposed to work on 64-bit architectures! *" >&2 + @echo "************************************************************************" >&2 + @false +endif touch build-arch-stamp build-indep: build-indep-stamp @@ -36,15 +45,6 @@ rm -f build-indep-stamp dh_clean -patch: patch-stamp -patch-stamp: - dpatch apply-all - touch patch-stamp - -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - install: install-indep install-arch install-indep: dh_testdir
signature.asc
Description: Digital signature
