[Blends-commit] [SCM] blends-dev branch, master, updated. ecf6f4f8acfb47c04294d59832e40259ee388f92

Andreas Tille tille at debian.org
Tue Dec 4 09:57:29 UTC 2012


The following commit has been merged in the master branch:
commit ecf6f4f8acfb47c04294d59832e40259ee388f92
Author: Andreas Tille <tille at debian.org>
Date:   Tue Dec 4 10:12:46 2012 +0100

    For some very strange reason there is no trace of 0.6.16.1 in this repository even if git-buildpackage should have ensured this.  Try to reconstruct files from 0.6.16.1 upload

diff --git a/blend-role b/blend-role
index 4ed306b..2b5e2ad 100755
--- a/blend-role
+++ b/blend-role
@@ -1,4 +1,6 @@
 #!/bin/bash
+#
+# $Id$
 
 usage () {
    echo "Usage:  `basename $0` <action> <Blend> [<role>]"
diff --git a/blend-update-menus b/blend-update-menus
index e6ef825..b9a06e8 100755
--- a/blend-update-menus
+++ b/blend-update-menus
@@ -1,4 +1,6 @@
 #!/bin/bash
+#
+# $Id$
 
 usage() {
    echo "Usage: `basename $0` [ -u <user> | -b <Blend> ]"
diff --git a/blend-update-usermenus b/blend-update-usermenus
index 7ceaf56..d4cbd47 100755
--- a/blend-update-usermenus
+++ b/blend-update-usermenus
@@ -1,4 +1,6 @@
 #!/bin/bash
+#
+# $Id$ 
 
 usage() {
    echo "Usage: `basename $0` <Blend>"
diff --git a/blend-user b/blend-user
index afdd8db..53a68a1 100755
--- a/blend-user
+++ b/blend-user
@@ -1,4 +1,6 @@
 #!/bin/bash
+#
+# $Id$
 
 usage () {
    echo "Usage:   `basename $0` <action> <Blend> <user> [<Role>]"
diff --git a/debian/changelog b/debian/changelog
index 10b4689..cbc208c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-blends (0.6.17) UNRELEASED; urgency=low
+blends (0.6.16.1) unstable; urgency=low
 
-  * Clean up some remaings from CVS/SVN ($Id)
+  * Revert bumping of debhelper and Standards-Version to match the
+    status of 0.6.15 and thus comply with freeze policy
+  * The fix to the sources.list* files to add the missing debian/ dirs
+    is now documented in BTS and this changelog entry
+    Closes: #693864
 
- -- Andreas Tille <tille at debian.org>  Mon, 19 Nov 2012 16:10:04 +0100
+ -- Andreas Tille <tille at debian.org>  Wed, 21 Nov 2012 08:51:11 +0100
 
 blends (0.6.16) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index ec63514..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+7
diff --git a/debian/control b/debian/control
index 2d596f8..75bc2fd 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,10 @@ Uploaders: Petter Reinholdtsen <pere at debian.org>,
  Cosimo Alfarano <kalfa at debian.org>,
  José L. Redrejo Rodríguez <jredrejo at debian.org>,
  Jonas Smedegaard <dr at jones.dk>
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: debiandoc-sgml, texlive-latex-base, texlive-latex-extra, 
  texlive-latex-recommended, texlive-fonts-recommended, ghostscript
-Standards-Version: 3.9.3
+Standards-Version: 3.9.1
 Vcs-Browser: http://git.debian.org/?p=blends/blends.git
 Vcs-Git: git://git.debian.org/git/blends/blends.git
 
diff --git a/share/blends/blend-actions b/share/blends/blend-actions
index 1bbd90c..e304ca1 100644
--- a/share/blends/blend-actions
+++ b/share/blends/blend-actions
@@ -1,3 +1,5 @@
+# $Id$
+#
 # Backend independant functions for blends package
 #
 # For error codes check in /usr/include/sysexits.h
diff --git a/share/blends/blend-update-menus b/share/blends/blend-update-menus
index feb2b1f..6ed40c8 100644
--- a/share/blends/blend-update-menus
+++ b/share/blends/blend-update-menus
@@ -1,3 +1,5 @@
+# $Id$
+
 # check if I am a specific user
 amI() {
 	RET=0
diff --git a/share/blends/unixgroups/blend-actions b/share/blends/unixgroups/blend-actions
index b1d619e..2b12a50 100644
--- a/share/blends/unixgroups/blend-actions
+++ b/share/blends/unixgroups/blend-actions
@@ -1,3 +1,5 @@
+# $Id$
+#
 # Backend dependant functions for blends package
 #
 # For error codes check in /usr/include/sysexits.h

-- 
Git repository for blends code



More information about the Blends-commit mailing list