CDBS: Relax copyright-check. strip cdbs 0.4.27 (not 0.4.27-1).debian/0.4.1-1

* Update local cdbs snippets:
  + Relax copyright-check to only warn about its discoveries.  Closes:
    bug#486994.
  + Update dependency cleanup to strip cdbs 0.4.27 (not 0.4.27-1).
* Update debian/copyright-hints.

6 files changed, 27 insertions, 269 deletions

diff --git a/debian/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk
index 5341ff9..645363b 100644
--- a/debian/cdbs/1/rules/copyright-check.mk
+++ b/debian/cdbs/1/rules/copyright-check.mk
@@ -74,18 +74,17 @@ debian/stamp-copyright-check:
 	@if [ ! -f debian/copyright_hints ]; then touch debian/copyright_hints; fi
 	@newstrings=`diff -u debian/copyright_hints debian/copyright_newhints | sed '1,2d' | egrep '^\+' - | sed 's/^\+//'`; \
 		if [ -n "$$newstrings" ]; then \
-			echo "ERROR: The following new or changed copyright notices discovered:"; \
+			echo "WARNING: The following new or changed copyright notices discovered:"; \
 			echo; \
 			echo "$$newstrings"; \
 			echo; \
 			echo "To fix the situation please do the following:"; \
 			echo "  1) Investigate the above changes and update debian/copyright as needed"; \
 			echo "  2) Replace debian/copyright_hints with debian/copyright_newhints"; \
-			exit 1; \
+		else \
+			echo 'No new copyright notices found - assuming no news is good news...'; \
+			rm -f debian/copyright_newhints; \
 		fi
-	
-	@echo 'No new copyright notices found - assuming no news is good news...'
-	rm -f debian/copyright_newhints
 	touch $@
 
 clean::
diff --git a/debian/changelog b/debian/changelog
index d20b4a2..f19d5c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 sugar-hulahop (0.4.1-1) unstable; urgency=low
 
   * New upstream release.
+  * Update local cdbs snippets:
+    + Relax copyright-check to only warn about its discoveries.  Closes:
+      bug#486994.
+    + Update dependency cleanup to strip cdbs 0.4.27 (not 0.4.27-1).
+  * Update debian/copyright-hints.
 
  -- Jonas Smedegaard <dr@jones.dk>  Sat, 21 Jun 2008 00:19:21 +0200
 
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 0a5bea1..383dbdf 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,32 +1,43 @@
 *No copyright* UNKNOWN []: Makefile.am
 	NEWS
+	components/Makefile.am
+	components/hulahopAddCertException.idl
+	components/hulahopAddCertException.js
 	configure.ac
 	data/Makefile.am
+	data/chrome/Makefile.am
+	data/chrome/brand.properties
+	data/chrome/chrome.manifest.in
+	data/chrome/netError.dtd
 	data/prefs.js
 	m4/python.m4
 	python/Makefile.am
+	python/config.py
 	python/config.py.in
 	python/hulahop.defs
 	python/hulahop.override
 	python/hulahopmodule.c
 	src/Makefile.am
+GENERATED FILE [1994-2002]: Makefile.in
+	components/Makefile.in
+	data/Makefile.in
+	data/chrome/Makefile.in
+	python/Makefile.in
+	src/Makefile.in
 LGPL-2+ [2007, Red Hat, Inc]: python/__init__.py
 	python/webview.py
 	src/HulahopDirectoryProvider.cpp
 	src/HulahopDirectoryProvider.h
 	src/hulahop-web-view.cpp
 	src/hulahop.cpp
-GENERATED FILE [1994-2002]: Makefile.in
-	data/Makefile.in
-	python/Makefile.in
-	src/Makefile.in
 LGPL-2+ [2006, Red Hat, Inc]: src/hulahop-web-view.h
 	src/hulahop.h
+*No copyright* GENERATED FILE []: python/hulahop.c
 GENERATED FILE [1992-1996, 1998-2001]: configure
 GPL GENERATED FILE [1996-1997, 1999-2000, 2002-2006]: missing
-GPL GENERATED FILE [1999-2000, 2003-2006 Free Software]: depcomp
+GPL GENERATED FILE [1999-2000, 2003-2007 Free Software]: depcomp
 GPL GENERATED FILE [2000-2001, 2003-2005 Free Software Foundation, Inc]: py-compile
 GPL-2+ GENERATED FILE [1996-2001, 2003-2006]: ltmain.sh
-MIT/X11 (BSD like) [and license / notice and this permission notice shall be included in / 1994 X Consortium]: install-sh
+MIT/X11 (BSD like) [1994 X Consortium]: install-sh
 UNKNOWN [1996-2004]: aclocal.m4
 UNKNOWN [the / 1991, 1999 Free Software Foundation, Inc]: COPYING
diff --git a/debian/rules b/debian/rules
index 52e4fe0..e8dc5b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,4 +35,4 @@ binary-predep/python-hulahop::
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), xulrunner-dev (>= $(python-xpcom-minver)), python-xpcom (>= $(python-xpcom-minver)), python-gtk2-dev
 
 # Merge duplicate build-dependencies
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27-1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')
diff --git a/python/config.py b/python/config.py
deleted file mode 100644
index dfa77b8..0000000
--- a/python/config.py
+++ /dev/null
@@ -1 +0,0 @@
-libxul_dir = '/home/marco/sugar-jhbuild/install/lib64/xulrunner-1.9'
diff --git a/python/hulahop.c b/python/hulahop.c
deleted file mode 100644
index 81caddd..0000000
--- a/python/hulahop.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 4 "hulahop.override"
-#include <Python.h>
-#include <pygtk/pygtk.h>
-
-#include "hulahop-web-view.h"
-
-#line 14 "hulahop.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGtkBin_Type;
-#define PyGtkBin_Type (*_PyGtkBin_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject G_GNUC_INTERNAL PyHulahopWebView_Type;
-
-#line 25 "hulahop.c"
-
-
-
-/* ----------- HulahopWebView ----------- */
-
-static PyObject *
-_wrap_hulahop_web_view_create_window(PyGObject *self)
-{
-    
-    hulahop_web_view_create_window(HULAHOP_WEB_VIEW(self->obj));
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_hulahop_web_view_grab_focus(PyGObject *self)
-{
-    
-    hulahop_web_view_grab_focus(HULAHOP_WEB_VIEW(self->obj));
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-#line 19 "hulahop.override"
-static PyObject *
-_wrap_hulahop_web_view_get_browser(PyGObject *self)
-{
-    return hulahop_web_view_get_browser(HULAHOP_WEB_VIEW(self->obj));
-}
-#line 57 "hulahop.c"
-
-
-#line 26 "hulahop.override"
-static PyObject *
-_wrap_hulahop_web_view_get_window_root(PyGObject *self)
-{
-    return hulahop_web_view_get_window_root(HULAHOP_WEB_VIEW(self->obj));
-}
-#line 66 "hulahop.c"
-
-
-static PyObject *
-_wrap_hulahop_web_view_push_js_context(PyGObject *self)
-{
-    
-    hulahop_web_view_push_js_context(HULAHOP_WEB_VIEW(self->obj));
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_hulahop_web_view_pop_js_context(PyGObject *self)
-{
-    
-    hulahop_web_view_pop_js_context(HULAHOP_WEB_VIEW(self->obj));
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_hulahop_web_view_evaluate_script(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "script", NULL };
-    char *script;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:HulahopWebView.evaluate_script", kwlist, &script))
-        return NULL;
-    
-    hulahop_web_view_evaluate_script(HULAHOP_WEB_VIEW(self->obj), script);
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static const PyMethodDef _PyHulahopWebView_methods[] = {
-    { "create_window", (PyCFunction)_wrap_hulahop_web_view_create_window, METH_NOARGS,
-      NULL },
-    { "grab_focus", (PyCFunction)_wrap_hulahop_web_view_grab_focus, METH_NOARGS,
-      NULL },
-    { "get_browser", (PyCFunction)_wrap_hulahop_web_view_get_browser, METH_NOARGS,
-      NULL },
-    { "get_window_root", (PyCFunction)_wrap_hulahop_web_view_get_window_root, METH_NOARGS,
-      NULL },
-    { "push_js_context", (PyCFunction)_wrap_hulahop_web_view_push_js_context, METH_NOARGS,
-      NULL },
-    { "pop_js_context", (PyCFunction)_wrap_hulahop_web_view_pop_js_context, METH_NOARGS,
-      NULL },
-    { "evaluate_script", (PyCFunction)_wrap_hulahop_web_view_evaluate_script, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { NULL, NULL, 0, NULL }
-};
-
-PyTypeObject G_GNUC_INTERNAL PyHulahopWebView_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0,                                 /* ob_size */
-    "_hulahop.WebView",                   /* tp_name */
-    sizeof(PyGObject),          /* tp_basicsize */
-    0,                                 /* tp_itemsize */
-    /* methods */
-    (destructor)0,        /* tp_dealloc */
-    (printfunc)0,                      /* tp_print */
-    (getattrfunc)0,       /* tp_getattr */
-    (setattrfunc)0,       /* tp_setattr */
-    (cmpfunc)0,           /* tp_compare */
-    (reprfunc)0,             /* tp_repr */
-    (PyNumberMethods*)0,     /* tp_as_number */
-    (PySequenceMethods*)0, /* tp_as_sequence */
-    (PyMappingMethods*)0,   /* tp_as_mapping */
-    (hashfunc)0,             /* tp_hash */
-    (ternaryfunc)0,          /* tp_call */
-    (reprfunc)0,              /* tp_str */
-    (getattrofunc)0,     /* tp_getattro */
-    (setattrofunc)0,     /* tp_setattro */
-    (PyBufferProcs*)0,  /* tp_as_buffer */
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,                      /* tp_flags */
-    NULL,                        /* Documentation string */
-    (traverseproc)0,     /* tp_traverse */
-    (inquiry)0,             /* tp_clear */
-    (richcmpfunc)0,   /* tp_richcompare */
-    offsetof(PyGObject, weakreflist),             /* tp_weaklistoffset */
-    (getiterfunc)0,          /* tp_iter */
-    (iternextfunc)0,     /* tp_iternext */
-    (struct PyMethodDef*)_PyHulahopWebView_methods, /* tp_methods */
-    (struct PyMemberDef*)0,              /* tp_members */
-    (struct PyGetSetDef*)0,  /* tp_getset */
-    NULL,                              /* tp_base */
-    NULL,                              /* tp_dict */
-    (descrgetfunc)0,    /* tp_descr_get */
-    (descrsetfunc)0,    /* tp_descr_set */
-    offsetof(PyGObject, inst_dict),                 /* tp_dictoffset */
-    (initproc)0,             /* tp_init */
-    (allocfunc)0,           /* tp_alloc */
-    (newfunc)0,               /* tp_new */
-    (freefunc)0,             /* tp_free */
-    (inquiry)0              /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_hulahop_startup(PyObject *self)
-{
-    int ret;
-
-    
-    ret = hulahop_startup();
-    
-    return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_hulahop_shutdown(PyObject *self)
-{
-    
-    hulahop_shutdown();
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_hulahop_set_profile_path(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "path", NULL };
-    char *path;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:set_profile_path", kwlist, &path))
-        return NULL;
-    
-    hulahop_set_profile_path(path);
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_hulahop_add_components_path(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "path", NULL };
-    char *path;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:add_components_path", kwlist, &path))
-        return NULL;
-    
-    hulahop_add_components_path(path);
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-const PyMethodDef pyhulahop_functions[] = {
-    { "startup", (PyCFunction)_wrap_hulahop_startup, METH_NOARGS,
-      NULL },
-    { "shutdown", (PyCFunction)_wrap_hulahop_shutdown, METH_NOARGS,
-      NULL },
-    { "set_profile_path", (PyCFunction)_wrap_hulahop_set_profile_path, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "add_components_path", (PyCFunction)_wrap_hulahop_add_components_path, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { NULL, NULL, 0, NULL }
-};
-
-/* initialise stuff extension classes */
-void
-pyhulahop_register_classes(PyObject *d)
-{
-    PyObject *module;
-
-    if ((module = PyImport_ImportModule("gtk")) != NULL) {
-        _PyGtkBin_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Bin");
-        if (_PyGtkBin_Type == NULL) {
-            PyErr_SetString(PyExc_ImportError,
-                "cannot import name Bin from gtk");
-            return ;
-        }
-    } else {
-        PyErr_SetString(PyExc_ImportError,
-            "could not import gtk");
-        return ;
-    }
-
-
-#line 255 "hulahop.c"
-    pygobject_register_class(d, "HulahopWebView", HULAHOP_TYPE_WEB_VIEW, &PyHulahopWebView_Type, Py_BuildValue("(O)", &PyGtkBin_Type));
-}