[SCM] freetuxtv/master: Added README.source documenting DFSG cleanup and instructions for importing new releases into Git

rak at users.alioth.debian.org rak at users.alioth.debian.org
Wed Apr 18 15:12:26 UTC 2012


The following commit has been merged in the master branch:
commit bd71b26a90525a81820cf868e2c70df3ee447f4d
Author: Ryan Kavanagh <rak at debian.org>
Date:   Wed Apr 18 10:59:01 2012 -0400

    Added README.source documenting DFSG cleanup and instructions for importing new releases into Git

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..3099913
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,30 @@
+freetuxtv for Debian
+---------
+
+    The sources have been DFSG cleaned to remove trademarked and otherwise
+    undistributable channel logos. The deleted files were under the directory
+        data/images/channels
+    and an up to date list of these can be found in the file
+        data/images/channels/Makefile.am .
+    Note that _none.png was created by the upstream author and is thus retained.
+    
+    Instructions for importing new upstream releases:
+        1) Import the contents of the upstream tarball into upstream branch:
+            git-import-orig --no-merge --pristine-tar --sign-tags <TARBALL_PATH>
+        2) Switch to dfsg_clean branch and import new upstream release:
+            git checkout dfsg_clean && git merge upstream
+        3) Make changes needed to make sources DFSG clean:
+            <MAKE dfsg_clean BRANCH DFSG CLEAN>
+            git commit -am "Make sources DFSG clean for version X.Y.Z"
+            git tag -s dfsg_clean/X.Y.Z
+        4) Merge changes into master branch and update changelog with new
+           version number:
+            git checkout master
+            git merge dfsg_clean/X.Y.Z
+            dch --version X.Y.Z~dfsg1-1 --preserve
+            git commit -am "Empty changelog entry with correct version"
+        5) Commit DFSG clean tarball to pristine-tar
+            git-buildpackage --git-pristine-tar-commit \
+                    --git-upstream-tree=dfsg_clean/0.6.3_dfsg1 --git-builder=""
+
+ -- Ryan Kavanagh <rak at debian.org>  Wed, 18 Apr 2012 10:47:58 -0400

-- 
freetuxtv packaging



More information about the pkg-multimedia-commits mailing list