[Pkg-cli-apps-commits] r5365 - in /packages/sysinfo/trunk/debian: README.source changelog control patches/10-better_xorg_parsing.diff patches/series patches/series-ubuntu rules watch
laney-guest at users.alioth.debian.org
laney-guest at users.alioth.debian.org
Wed Jan 5 23:26:54 UTC 2011
Author: laney-guest
Date: Wed Jan 5 23:26:54 2011
New Revision: 5365
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5365
Log:
* debian/rules, debian/patches/series{,-ubuntu}: Drop Ubuntu specific
patches: patch will have no effect if affected file is not on the
system and thus is harmless to have on Debian.
* debian/patches/10_better-xorg-parsing.patch: Add new patch to improve
Xorg log parsing to work correctly on Debian (and with timestamped
logs) and not to crash the program on a malformed/empty input file.
* debian/*: Update packaging to DH7 & dh-autoreconf, include README.source
* debian/control:
+ Update Homepage field to sf.net page
+ Standards-Version → 3.9.3, no changes required
* debian/watch: Correctly sort beta versions lower than releases
Added:
packages/sysinfo/trunk/debian/README.source
packages/sysinfo/trunk/debian/patches/10-better_xorg_parsing.diff
Removed:
packages/sysinfo/trunk/debian/patches/series-ubuntu
Modified:
packages/sysinfo/trunk/debian/changelog
packages/sysinfo/trunk/debian/control
packages/sysinfo/trunk/debian/patches/series
packages/sysinfo/trunk/debian/rules
packages/sysinfo/trunk/debian/watch
Added: packages/sysinfo/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/README.source?rev=5365&op=file
==============================================================================
--- packages/sysinfo/trunk/debian/README.source (added)
+++ packages/sysinfo/trunk/debian/README.source Wed Jan 5 23:26:54 2011
@@ -1,0 +1,58 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+ export QUILT_PATCHES=debian/patches
+ break
+ fi
+ done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+ quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+ quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches. Then, for every file that will be modified by this patch,
+run:
+
+ quilt add <file>
+
+before editing those files. You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly. After editing the files, run:
+
+ quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+ quilt import -P <patch> /path/to/patch
+ quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches. The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+ quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
Modified: packages/sysinfo/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/changelog?rev=5365&op=diff
==============================================================================
--- packages/sysinfo/trunk/debian/changelog (original)
+++ packages/sysinfo/trunk/debian/changelog Wed Jan 5 23:26:54 2011
@@ -1,7 +1,16 @@
sysinfo (0.7-4) UNRELEASED; urgency=low
- * debian/control: Add missing lsb-release build-dep so that distro detection
- works to select the correct patchset.
+ * debian/rules, debian/patches/series{,-ubuntu}: Drop Ubuntu specific
+ patches: patch will have no effect if affected file is not on the
+ system and thus is harmless to have on Debian.
+ * debian/patches/10_better-xorg-parsing.patch: Add new patch to improve
+ Xorg log parsing to work correctly on Debian (and with timestamped
+ logs) and not to crash the program on a malformed/empty input file.
+ * debian/*: Update packaging to DH7 & dh-autoreconf, include README.source
+ * debian/control:
+ + Update Homepage field to sf.net page
+ + Standards-Version → 3.9.3, no changes required
+ * debian/watch: Correctly sort beta versions lower than releases
-- Iain Lane <laney at ubuntu.com> Tue, 02 Feb 2010 00:35:30 +0000
Modified: packages/sysinfo/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/control?rev=5365&op=diff
==============================================================================
--- packages/sysinfo/trunk/debian/control (original)
+++ packages/sysinfo/trunk/debian/control Wed Jan 5 23:26:54 2011
@@ -3,9 +3,8 @@
Priority: optional
Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
Uploaders: David Paleino <dapal at debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, quilt
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, quilt (>= 0.46-7~), dh-autoreconf
Build-Depends-Indep: cli-common-dev (>= 0.4.4),
- lsb-release,
mono-devel (>= 2.4.3),
autoconf,
automake,
@@ -13,8 +12,8 @@
libgconf2.0-cil-dev,
libglib2.0-cil-dev,
libglade2.0-cil-dev
-Standards-Version: 3.8.3
-Homepage: http://gsysinfo.sourceforge.net/
+Standards-Version: 3.9.3
+Homepage: https://sourceforge.net/projects/gsysinfo/
Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/sysinfo/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/
Added: packages/sysinfo/trunk/debian/patches/10-better_xorg_parsing.diff
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/patches/10-better_xorg_parsing.diff?rev=5365&op=file
==============================================================================
--- packages/sysinfo/trunk/debian/patches/10-better_xorg_parsing.diff (added)
+++ packages/sysinfo/trunk/debian/patches/10-better_xorg_parsing.diff Wed Jan 5 23:26:54 2011
@@ -1,0 +1,66 @@
+Decription: Make Xorg.0.log parsing a bit more robust & work with current xorgs
+Author: Iain Lane <laney at ubuntu.com>
+Origin: vendor
+Bug-Upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=3025564&group_id=139177&atid=746610
+
+Index: sysinfo-0.7/Sysinfo/SystemInfo.cs
+===================================================================
+--- sysinfo-0.7.orig/Sysinfo/SystemInfo.cs 2011-01-05 22:34:54.044153395 +0000
++++ sysinfo-0.7/Sysinfo/SystemInfo.cs 2011-01-05 22:34:46.323557614 +0000
+@@ -336,6 +336,7 @@
+
+ String temp;
+ Boolean xorgB = false;
++ int index;
+
+ try {
+
+@@ -343,19 +344,42 @@
+ using (TextReader textread = File.OpenText("/var/log/Xorg.0.log")) {
+
+ while ( xorgB == false ) {
+
+ temp = textread.ReadLine();
++
++ // EOF
++ if (temp == null) {
++
++ break;
++ }
++
++ // Blank line
++ if (temp.Trim().Length == 0) {
++
++ continue;
++ }
+
+ //version
+- if ( temp.StartsWith("X Window System Version")) {
+-
+- system_xorg = temp.Remove(0, 24);
++ index = temp.IndexOf("X Window System Version");
++
++ if (index >= 0 && system_xorg == "unknown") {
++
++ system_xorg = temp.Substring(index + 24);
++ }
++
++ index = temp.IndexOf("X.Org X Server");
++
++ if (index >= 0 && system_xorg == "unknown") {
++
++ system_xorg = temp.Substring(index + 15);
+ }
+
+ //build date
+- if ( temp.StartsWith("Build Date")) {
+-
+- system_xorg = system_xorg + " (" + temp.Remove(0, 12) + ")";
++ index = temp.IndexOf("Build Date");
++
++ if (index >= 0) {
++
++ system_xorg = system_xorg + " (" + temp.Substring(index + 12) + ")";
+ xorgB = true;
+ }
+
Modified: packages/sysinfo/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/patches/series?rev=5365&op=diff
==============================================================================
--- packages/sysinfo/trunk/debian/patches/series (original)
+++ packages/sysinfo/trunk/debian/patches/series Wed Jan 5 23:26:54 2011
@@ -7,3 +7,5 @@
06-check_nvidia_settings.patch
07-nvidia_crash.diff
08-correct_url.diff
+09-ubuntu_lsb_release.diff
+10-better_xorg_parsing.diff
Modified: packages/sysinfo/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/rules?rev=5365&op=diff
==============================================================================
--- packages/sysinfo/trunk/debian/rules (original)
+++ packages/sysinfo/trunk/debian/rules Wed Jan 5 23:26:54 2011
@@ -4,79 +4,16 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 )
include /usr/share/quilt/quilt.make
-DISTRO = "$(shell lsb_release -si)"
+override_dh_install:
+ -rm -rf $(CURDIR)/debian/sysinfo/usr/lib/pkgconfig
+ dh_install
-ifeq ($(DISTRO),"Ubuntu")
-export QUILT_SERIES=$(QUILT_PATCH_DIR)/series-ubuntu
-endif
-
-configure: config-stamp
-config-stamp: $(QUILT_STAMPFN)
- dh_testdir
-
- aclocal
- autoconf
- automake --add-missing --copy
-
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-build: build-stamp
-build-stamp: config-stamp
- dh_testdir
-
- $(MAKE)
-
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
-
- [ ! -f Makefile ] || $(MAKE) distclean
- find . -name "Makefile.in" -delete
- rm -rf autom4te.cache/
- dh_clean build-stamp config.sub config.guess configure aclocal.m4
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- $(MAKE) DESTDIR=$(CURDIR)/debian/sysinfo install
-
- -rm -rf $(CURDIR)/debian/sysinfo/usr/lib/pkgconfig
-
-binary-arch: build install
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
-# dh_install
- dh_installmenu
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_clideps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+%:
+ dh --with quilt,autoreconf $@
get-orig-source:
[ -d ../tarballs ] || mkdir ../tarballs
@@ -86,5 +23,4 @@
--rename \
--destdir ../tarballs
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: get-orig-source
Modified: packages/sysinfo/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/watch?rev=5365&op=diff
==============================================================================
--- packages/sysinfo/trunk/debian/watch (original)
+++ packages/sysinfo/trunk/debian/watch Wed Jan 5 23:26:54 2011
@@ -1,4 +1,5 @@
version=3
+opts="uversionmangle=s/beta/~beta/" \
http://sf.net/gsysinfo/sysinfo-(.*)\.tar\.gz
More information about the Pkg-cli-apps-commits
mailing list