[SCM] hydrogen/master: Fix drop README.source section about special care for CDBS: Directly contradicts section emphasizing that *no* special care is needed (CDBS users handle merges).

js at users.alioth.debian.org js at users.alioth.debian.org
Wed Jul 19 06:57:43 UTC 2017


The following commit has been merged in the master branch:
commit ac39c01d40af0ed71f1774cc00e71db7834f198c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jul 19 08:46:44 2017 +0200

    Fix drop README.source section about special care for CDBS: Directly contradicts section emphasizing that *no* special care is needed (CDBS users handle merges).
    
    This reverts commit 83e526530b7cbcadea29dfc010a3d5df296101bc.

diff --git a/debian/README.source b/debian/README.source
index 003b178..f88449e 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -9,21 +9,3 @@ More info here: http://wiki.debian.org/CDBS+git-buildpackage
 
 
  -- Jonas Smedegaard <dr at jones.dk>  Mon, 18 Feb 2013 12:55:37 +0100
-
-control.in vs. control
-----------------------
-
-As is common with CDBS-based packaged, the debian/control file is
-generated (though not automatically) from debian/control.in
-Therefore, it is recommended to make any changes to the debian/control.in
-file and then regenerate the real debian/control using something like the
-following:
-
-    debian/rules clean DEB_MAINTAINER_MODE=1
-
-Please make sure to check the generated debian/control file (as someone might
-have committed changes directly to this file without updating debian/control.in
-- which might result in a loss of their changes)
-
-
- -- Jaromír Mikeš <mira.mikes at seznam.cz>  Tue, 21 Oct 2014 14:02:46 +0200

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list