rev 15894 - krap/libvncserver/trunk/debian

[Fathi Boudra]

Author: fabo
Date: 2009-09-02 08:33:36 +0000 (Wed, 02 Sep 2009)
New Revision: 15894

Modified:
   krap/libvncserver/trunk/debian/README.source
   krap/libvncserver/trunk/debian/changelog
   krap/libvncserver/trunk/debian/rules
Log:
Merge aurelien changes.


Modified: krap/libvncserver/trunk/debian/README.source
===================================================================
--- krap/libvncserver/trunk/debian/README.source	2009-09-02 08:24:40 UTC (rev 15893)
+++ krap/libvncserver/trunk/debian/README.source	2009-09-02 08:33:36 UTC (rev 15894)
@@ -1,6 +1,57 @@
-This package uses quilt for upstream source code patch management. Please read
-/usr/share/doc/quilt/README.source for more information how to apply, unapply,
-add, modify or remove patches.
+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.
 
-Please note that /usr/share/doc/quilt/README.source is only available in quilt
-version 0.46-4.1 or later.
+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
+        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: krap/libvncserver/trunk/debian/changelog
===================================================================
--- krap/libvncserver/trunk/debian/changelog	2009-09-02 08:24:40 UTC (rev 15893)
+++ krap/libvncserver/trunk/debian/changelog	2009-09-02 08:33:36 UTC (rev 15894)
@@ -1,14 +1,19 @@
-libvncserver (0.9.7-2) UNRELEASED; urgency=low
+libvncserver (0.9.7-3) UNRELEASED; urgency=low
 
   * Update debian/control:
     - Set myself as Maintainer. Take over the package maintenance.
-    - Bump Standards-Version to 3.8.3 (add debian/README.source file).
-  * Update debian/rules:
-    - Fix FTBFS on GNU/kFreeBSD: pass --same-arch to debhelper.
-      (Closes: #542592)
+    - Bump Standards-Version to 3.8.3 (no changes needed).
 
- -- Fathi Boudra <fabo at debian.org>  Sat, 22 Aug 2009 10:36:30 +0200
+ -- Fathi Boudra <fabo at debian.org>  Wed, 02 Sep 2009 10:36:30 +0200
 
+libvncserver (0.9.7-2) unstable; urgency=low
+
+  * QA upload.
+  * Don't build linuxvnc on non-linux architectures. (Closes: #542592)
+  * Add a debian/README.source.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 30 Aug 2009 17:15:14 +0200
+
 libvncserver (0.9.7-1) unstable; urgency=low
 
   * QA upload.

Modified: krap/libvncserver/trunk/debian/rules
===================================================================
--- krap/libvncserver/trunk/debian/rules	2009-09-02 08:24:40 UTC (rev 15893)
+++ krap/libvncserver/trunk/debian/rules	2009-09-02 08:33:36 UTC (rev 15894)
@@ -1,7 +1,13 @@
 #!/usr/bin/make -f
 
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+ifneq ($(DEB_HOST_ARCH_OS), linux)
+  EXTRA_DH_ARG=-Nlinuxvnc
+endif
+
 %:
-	dh --with quilt --dbg-package=libvncserver0-dbg --same-arch $@
+	dh --with quilt --dbg-package=libvncserver0-dbg $(EXTRA_DH_ARG) $@
 
 override_dh_auto_configure:
 	aclocal