Bug#435670: NMU patch for xresprobe 0.4.23debian1-0.1
Package: xresprobe
Version: 0.4.23debian1
Here is the patch for my NMU of xresprobe.
diff -ur xresprobe-0.4.23debian1/debian/changelog xresprobe-0.4.23debian1-0.1/debian/changelog
--- xresprobe-0.4.23debian1/debian/changelog 2006-04-08 16:04:46.000000000 +0200
+++ xresprobe-0.4.23debian1-0.1/debian/changelog 2007-08-02 14:43:47.000000000 +0200
@@ -1,3 +1,13 @@
+xresprobe (0.4.23debian1-0.1) unstable; urgency=low
+
+ * Non-maintainer upload with maintainer approval.
+ * Fix bashism in ddcprobe.sh. (Closes: #393929)
+ * Add copyright information for ddcprobe. (Closes: #361086)
+ * Updated FSF address to quiet down lintian.
+ * Updated standards version from 3.6.1.0 to 3.7.2. No change needed.
+
+ -- Petter Reinholdtsen <pere@debian.org> Thu, 2 Aug 2007 14:27:00 +0200
+
xresprobe (0.4.23debian1) unstable; urgency=low
* New release based in 0.4.23 release of Ubuntu.
diff -ur xresprobe-0.4.23debian1/ddcprobe.sh xresprobe-0.4.23debian1-0.1/ddcprobe.sh
--- xresprobe-0.4.23debian1/ddcprobe.sh 2006-03-22 03:59:05.000000000 +0100
+++ xresprobe-0.4.23debian1-0.1/ddcprobe.sh 2006-07-17 22:19:27.000000000 +0200
@@ -26,7 +26,7 @@
else
DDCPROBE="$(ddcprobe 2>/dev/null)"
fi
-if [ "$?" == "1" ]; then
+if [ "$?" = "1" ]; then
exit 1
fi
if (echo "$DDCPROBE" | egrep "(edidfail|ddcfail)" >/dev/null 2>&1); then
diff -ur xresprobe-0.4.23debian1/debian/control xresprobe-0.4.23debian1-0.1/debian/control
--- xresprobe-0.4.23debian1/debian/control 2006-03-22 04:05:02.000000000 +0100
+++ xresprobe-0.4.23debian1-0.1/debian/control 2007-08-02 14:41:20.000000000 +0200
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Otavio Salvador <otavio@debian.org>, David Nusinow <dnusinow@debian.org>
Build-Depends: debhelper (>= 4.0.0), cdbs
-Standards-Version: 3.6.1.0
+Standards-Version: 3.7.2
Package: xresprobe
Architecture: any
diff -ur xresprobe-0.4.23debian1/debian/copyright xresprobe-0.4.23debian1-0.1/debian/copyright
--- xresprobe-0.4.23debian1/debian/copyright 2005-03-11 20:21:55.000000000 +0100
+++ xresprobe-0.4.23debian1-0.1/debian/copyright 2007-08-02 14:39:56.000000000 +0200
@@ -1,5 +1,5 @@
-Copyright (C) 2004 Canonical Software, written by
-Daniel Stone <daniel.stone@canonical.com>.
+The package scripts are copyright (C) 2004 Canonical Software, written by
+Daniel Stone <daniel.stone@canonical.com> and licensed under GPL v2.
Copyright:
@@ -14,8 +14,36 @@
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301, USA.
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The minifind.c source is Copyright (c) 2002 Terra Soft Solutions, Inc.
+licensed using GPL.
+
+The x86-common.c and lrmi.c source is Copyright (C) 1998 by Josh Vanderhoof
+and licensed like this:
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation files
+ (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL JOSH VANDERHOOF BE LIABLE FOR
+ ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+The source in x86emu/ is Copyright (C) 1996-1999 SciTech Software, Inc.,
+copyright (C) David Mosberger-Tang and Copyright (C) 1999 Egbert Eich.
Reply to: