Re: [PATCH] Debian packaging for 0.99.4

4 messages, 3 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH] Debian packaging for 0.99.4

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:03

Matthias Urlichs [off-list ref] writes:
- Split gitk off to its own package;
  it needs tk installed, but nothing else does.
I just noticed from "dpkg --info" output that the generated
git-tk has "Architecture: i386".  Shouldn't it read "all" and
resulting package also named git-tk_${VERSION}_all.deb, instead
of whatever architecture I happened to build it?

Re: [PATCH] Debian packaging for 0.99.4

From: Martin Langhoff <hidden>
Date: 2016-06-15 22:42:04

I just noticed from "dpkg --info" output that the generated
git-tk has "Architecture: i386".  Shouldn't it read "all" and
resulting package also named git-tk_${VERSION}_all.deb, instead
of whatever architecture I happened to build it?
It is correct to have Architecture: i386, as you'd naturally have
multiple binary packages. When this is uploaded to the Debian archive,
all the other architectures are built in the "buildd" farm. That's why
the source package 'native' arch is 'any'.

Packages with arch 'all' are interpreted languages. The cogito package
will probably be for 'all' arches, and just be one binary package.

cheers,


martin

[PATCH] more Debian packaging fixes

From: Matthias Urlichs <hidden>
Date: 2016-06-15 22:42:04

git-tk should be architecture independent.
git-core forgot to depend on perl.

Signed-Off-By: Matthias Urlichs <redacted>
---
Hi,

Junio C Hamano:
Matthias Urlichs [off-list ref] writes:
quoted
- Split gitk off to its own package;
  it needs tk installed, but nothing else does.
I just noticed from "dpkg --info" output that the generated
git-tk has "Architecture: i386".  Shouldn't it read "all" and
resulting package also named git-tk_${VERSION}_all.deb, instead
of whatever architecture I happened to build it?
True.

diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 git-core (0.99.5-0) unstable; urgency=low
 
   * Split off gitk.
+    - ... into an architecture-independent package.
 
  -- Matthias Urlichs <smurf@debian.org>  Thu, 11 Aug 2005 01:43:24 +0200
 
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.6.1
 
 Package: git-core
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, patch, diff, rcs
+Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, patch, diff, rcs
 Recommends: rsync, curl, ssh, libmail-sendmail-perl, libemail-valid-perl
 Conflicts: git
 Description: The git content addressable filesystem
@@ -18,7 +18,7 @@ Description: The git content addressable
  similar to other SCM tools.
 
 Package: git-tk
-Architecture: any
+Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, git-core, tk8.4
 Description: The git content addressable filesystem, GUI add-on
  This package contains 'gitk', the git revision tree visualizer
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -65,33 +65,36 @@ install: build
 	dh_movefiles -p git-core
 	find debian/tmp -type d -o -print | sed -e 's/^/? /'
 
-binary: build install
+binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate	
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress 
-	dh_fixperms
-#	dh_perl
-#	dh_python
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_strip -a
+	dh_compress  -a
+	dh_fixperms -a
+	dh_perl -a
+	dh_makeshlibs -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_compress  -i
+	dh_fixperms -i
+	dh_makeshlibs -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary: binary-arch binary-indep
 
 .PHONY: build clean binary install clean debian-clean
-- 
Matthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
 - -
GUBBISH [a portmanteau of "garbage" and "rubbish"?] n. Garbage; crap;
   nonsense.  "What is all this gubbish?"
				-- From the AI Hackers' Dictionary

Re: [PATCH] Debian packaging for 0.99.4

From: Matthias Urlichs <hidden>
Date: 2016-06-15 22:42:04

Hi,

Martin Langhoff:
It is correct to have Architecture: i386, as you'd naturally have
multiple binary packages.
However, git(-t)k doesn't contain any i386 code, just a tk script.
Packages with arch 'all' are interpreted languages.
Exactly. ;-)

-- 
Matthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
 - -
compuberty, n:
	The uncomfortable period of emotional and hormonal changes a
	computer experiences when the operating system is upgraded and
	a sun4 is put online sharing files.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help