[Dolibarr-git] [Dolibarr/dolibarr] 30c4d5: Fix for debian package

[Laurent Destailleur]

  Branch: refs/heads/3.3_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 30c4d5dedb9165a7fac19541502ab7618dd3f9a9
      
https://github.com/Dolibarr/dolibarr/commit/30c4d5dedb9165a7fac19541502ab7618dd3f9a9
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-18 (Wed, 18 Sep 2013)

  Changed paths:
    M build/debian/get-orig-source.sh
    M build/debian/watch

  Log Message:
  -----------
  Fix for debian package


  Commit: 848c69382256274a1bceb5c9a767e20fdd3eac9f
      
https://github.com/Dolibarr/dolibarr/commit/848c69382256274a1bceb5c9a767e20fdd3eac9f
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-18 (Wed, 18 Sep 2013)

  Changed paths:
    M build/debian/watch

  Log Message:
  -----------
  Fix: Error in url


  Commit: 2a1dae78ca65037df8ce7d4eaf720117cf72c1eb
      
https://github.com/Dolibarr/dolibarr/commit/2a1dae78ca65037df8ce7d4eaf720117cf72c1eb
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-19 (Thu, 19 Sep 2013)

  Changed paths:
    M build/tgz/tar_exclude.txt

  Log Message:
  -----------
  Fix: We must not remove sources from packages


  Commit: bd0e328d5b5fa85cf59a83fbd87d049b1565e15e
      
https://github.com/Dolibarr/dolibarr/commit/bd0e328d5b5fa85cf59a83fbd87d049b1565e15e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-19 (Thu, 19 Sep 2013)

  Changed paths:
    M build/debian/get-orig-source.sh

  Log Message:
  -----------
  Use official package directly to build debian.


  Commit: ad09470f48dbbf8374171c82847145e916c7c79e
      
https://github.com/Dolibarr/dolibarr/commit/ad09470f48dbbf8374171c82847145e916c7c79e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/rapport/pdf_paiement.class.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Fix: Better management of pdf generation when tcpdf not available.


  Commit: 8024a613760856d0319fd9556c9740567f6fab3e
      
https://github.com/Dolibarr/dolibarr/commit/8024a613760856d0319fd9556c9740567f6fab3e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M htdocs/comm/action/fiche.php

  Log Message:
  -----------
  Add missing label


  Commit: 52a27a42020034e027a51db7c74c27ee0c2fb0fc
      
https://github.com/Dolibarr/dolibarr/commit/52a27a42020034e027a51db7c74c27ee0c2fb0fc
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M build/debian/get-orig-source.sh
    M build/debian/watch
    M build/tgz/tar_exclude.txt
    M htdocs/comm/action/fiche.php
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/rapport/pdf_paiement.class.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.3_backported

Conflicts:
        htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/47e3ae99c1cc...52a27a420200