ODROID: add to parse epoch from version number

Signed-off-by: Dongjin Kim <[email protected]>
tobetter · Apr 27, 2018 · 9eb54c9 · 9eb54c9
1 parent 1d84261
commit 9eb54c9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,4 @@
-linux (3.16.56-0) unstable; urgency=medium
+linux (5:3.16.56-0) unstable; urgency=medium
 
   * Initiate the build for Hardkernel's SBC ODROID
 

diff --git a/debian/control.md5sum b/debian/control.md5sum
@@ -1,5 +1,5 @@
 a192684cc663f2effafc8fbdfc05c978  debian/bin/gencontrol.py
-77ea849ab9566c07fe50d1b94f683af4  debian/changelog
+240b399bc45af66e28db5e577b0d430c  debian/changelog
 09d1784f420650aa08f4df7f347285f9  debian/templates/control.main.in
 338f1616874d5fe39915d8cf058c3cfd  debian/templates/image.preinst.in
 279db6c0dfdc22441b1ddfbf768c3de6  debian/templates/image.prerm.in

diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py
@@ -13,6 +13,12 @@ class Changelog(list):
 )
 \ 
 \(
+(?:
+    (?P<epoch>
+        \d+
+    )
+    :
+)?
 (?P<version>
     [^\(\)\ \t]+
 )

diff --git a/debian/rules b/debian/rules
@@ -68,18 +68,6 @@ DIR_ORIG = ../orig/$(SOURCE)-$(VERSION_UPSTREAM)
 TAR_ORIG_NAME = $(SOURCE)_$(VERSION_UPSTREAM).orig.tar.xz
 TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME)))
 
-orig: $(DIR_ORIG)
-	rsync --delete --exclude /debian --exclude .svk --exclude .svn --exclude .git --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
-	QUILT_PATCHES='$(CURDIR)/debian/patches' QUILT_PC=.pc quilt push --quiltrc - -a -q --fuzz=0
-
-$(DIR_ORIG):
-ifeq ($(TAR_ORIG),)
-	$(error Cannot find orig tarball $(TAR_ORIG_NAME))
-else
-	mkdir -p ../orig
-	tar -C ../orig -xaf $(TAR_ORIG)
-endif
-
 maintainerclean:
 	rm -f debian/config.defines.dump debian/control debian/control.md5sum debian/linux-headers-* debian/linux-image-* debian/rules.gen
 	rm -rf $(filter-out debian .svk .svn .git, $(wildcard * .[^.]*))
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,12 @@ class Changelog(list): @@
     )
     \
     \(
+    (?:
+        (?P<epoch>
+            \d+
+        )
+        :
+    )?
     (?P<version>
         [^\(\)\ \t]+
     )
@@ Expand Down @@