[Debootloaders-devel] r246 - in /trunk/silo/debian: changelog patches/series patches/silo-linux-types.patch patches/silo-revert-relocation-commit.patch rules

[jurij at alioth.debian.org]

Author: jurij
Date: Sun Feb 28 00:11:04 2010
New Revision: 246

URL: http://svn.debian.org/wsvn/debootloaders/?sc=1&rev=246
Log:
Start 1.4.14+git20100228-1.
Remove patches merged upstream.
Fix the build-tree target to not fail when series file is empty.


Removed:
    trunk/silo/debian/patches/silo-linux-types.patch
    trunk/silo/debian/patches/silo-revert-relocation-commit.patch
Modified:
    trunk/silo/debian/changelog
    trunk/silo/debian/patches/series
    trunk/silo/debian/rules

Modified: trunk/silo/debian/changelog
URL: http://svn.debian.org/wsvn/debootloaders/trunk/silo/debian/changelog?rev=246&op=diff
==============================================================================
--- trunk/silo/debian/changelog (original)
+++ trunk/silo/debian/changelog Sun Feb 28 00:11:04 2010
@@ -1,3 +1,16 @@
+silo (1.4.14+git20100228-1) UNRELEASED; urgency=low
+
+  [ Jurij Smakov]
+  * Remove the following Debian patches merged upstream:
+    - silo-linux-types.patch
+      (merged as eb1b1642b586cfe2b99cf890a7849226beac4e9b)
+    - silo-revert-relocation-commit.patch
+      (merged as 93cc5699a11424177960afa4b6a8bd6cbc72dcd9)
+  * Fix the build-tree target in debian/rules to not fail when
+    the quilt series file is empty.
+
+ -- Jurij Smakov <jurij at debian.org>  Sun, 28 Feb 2010 00:02:18 +0000
+
 silo (1.4.14+git20100207-1) unstable; urgency=low
 
   [ Jurij Smakov ]

Modified: trunk/silo/debian/patches/series
URL: http://svn.debian.org/wsvn/debootloaders/trunk/silo/debian/patches/series?rev=246&op=diff
==============================================================================
--- trunk/silo/debian/patches/series (original)
+++ trunk/silo/debian/patches/series Sun Feb 28 00:11:04 2010
@@ -1,2 +1,1 @@
-silo-linux-types.patch
-silo-revert-relocation-commit.patch
+# No Debian-specific patches currently.

Modified: trunk/silo/debian/rules
URL: http://svn.debian.org/wsvn/debootloaders/trunk/silo/debian/rules?rev=246&op=diff
==============================================================================
--- trunk/silo/debian/rules (original)
+++ trunk/silo/debian/rules Sun Feb 28 00:11:04 2010
@@ -15,7 +15,7 @@
 	mkdir $(BUILD_TREE)
 	tar cf - --exclude debian . | (cd $(BUILD_TREE) && tar xf -)
 	ln -s ../debian/patches $(BUILD_TREE)/patches  
-	cd $(BUILD_TREE) && quilt push -a
+	cd $(BUILD_TREE) && test -z "$(quilt series)" || quilt push -a
 
 clean:
 	dh_testdir