[SCM] ardour/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
Mon Jul 31 06:29:03 UTC 2017


The following commit has been merged in the master branch:
commit 87e21af3bdad372cf188d2d6745e44893f4f541d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jul 31 02:28:45 2017 -0400

    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 a6d97e94af391e989be16dbc4493cba6e551d517.

diff --git a/debian/README.source b/debian/README.source
index 2146866..2b962b4 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -11,24 +11,6 @@ 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)
-
-
- -- IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>  Thu, 13 Sep 2015 20:11:02 +0200
-
 git-tuneclone.sh
 ----------------
 
@@ -46,6 +28,7 @@ You are of course free to *not* run the script, if you prefer.
 
  -- IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>  Tue, 11 Nov 2015 11:11:03 +0100
 
+
 copyright_newhints
 ------------------
 

-- 
ardour Debian packaging



More information about the pkg-multimedia-commits mailing list