[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#459219: android-tools packaging



On Wed, 2012-08-15 at 16:07 +0200, Adnan Hodzic wrote:
> >On Tue, Aug 14, 2012 at 8:01 PM, Laszlo Boszormenyi (GCS) <gcs@debian.hu> wrote:
> > I think this ITP should be several ones. One for command like tools like
> > adb , one for Eclipse plugin and one for the emulator at least.
> > ATM Adnan's work is great. I'm a DD and just changed bits in his
> > packaging to be perfect.
> 
> Thank you for appreciating my work.
> Which bits did you change because I don't see any chances in the code.
 I've my own package, not yet uploaded to anywhere. Attached a diff what
I've changed. I was wrong by the way, it's Marcin who made a very good
package of android-tools. He tries to outsmart debhelper and do some
parts by hand. It's not needed, just show debhelper where it can find
the files. Also, install manpage as is, not with the binary.
I would be happy to maintain android-tools with him or me for Debian and
he is for Ubuntu but with the same package base.

> Also why do you think we should separate them in couple of pieces
> instead of having the installer which could let you select which
> pieces you want and which you don't?
> 
> I personally would like to have it all in a single package, thus why I
> started working on this installer.
 Still didn't check your installer in detail. But why do you want to be
outsmart apt-get and dpkg? It would be similar like a gnome-all package,
where you choose you need for example evince, but not gome-terminal.
How do you handle Eclipse dependency? One package has one dependency
line in it. If you set the package need Eclipse, it would be an overkill
for ones they don't need the Android plug-in in general. If you miss it,
you will install the plug-in without the editor that uses it.
Also, you'll just kill GUI based package installers. Those won't handle
that you ask question on CLI.
May add more CLI tools to android-tools package, but currently it seems
to be a good start.

> In case we do decide to the way you suggested above, besides being an
> uploader do you mind me being a maintainer together with you? Because
> I really do have great interest in future of this package.
 Maintainer and uploader have the same rights and can be changed anytime
one doesn't want contribute to the package anymore.

Laszlo/GCS
diff -Nru android-tools-4.1.1+git20120801/debian/android-tools-adb.install android-tools-4.1.1+git20120801/debian/android-tools-adb.install
--- android-tools-4.1.1+git20120801/debian/android-tools-adb.install	2012-07-16 16:14:25.000000000 +0200
+++ android-tools-4.1.1+git20120801/debian/android-tools-adb.install	2012-08-14 15:02:29.000000000 +0200
@@ -1,2 +1 @@
-usr/bin/adb
-usr/man/*
+core/adb/adb usr/bin/
diff -Nru android-tools-4.1.1+git20120801/debian/android-tools-adb.manpages android-tools-4.1.1+git20120801/debian/android-tools-adb.manpages
--- android-tools-4.1.1+git20120801/debian/android-tools-adb.manpages	1970-01-01 01:00:00.000000000 +0100
+++ android-tools-4.1.1+git20120801/debian/android-tools-adb.manpages	2012-08-14 15:05:26.000000000 +0200
@@ -0,0 +1 @@
+debian/adb.1
diff -Nru android-tools-4.1.1+git20120801/debian/android-tools-fastboot.install android-tools-4.1.1+git20120801/debian/android-tools-fastboot.install
--- android-tools-4.1.1+git20120801/debian/android-tools-fastboot.install	2012-07-16 16:14:25.000000000 +0200
+++ android-tools-4.1.1+git20120801/debian/android-tools-fastboot.install	2012-08-14 15:04:16.000000000 +0200
@@ -1 +1 @@
-usr/bin/fastboot
+core/fastboot/fastboot usr/bin/
diff -Nru android-tools-4.1.1+git20120801/debian/changelog android-tools-4.1.1+git20120801/debian/changelog
--- android-tools-4.1.1+git20120801/debian/changelog	2012-08-01 12:30:36.000000000 +0200
+++ android-tools-4.1.1+git20120801/debian/changelog	2012-08-14 14:40:55.000000000 +0200
@@ -1,3 +1,10 @@
+android-tools (4.1.1+git20120801-1) unstable; urgency=low
+
+  * Initial upload to Debian (closes: #459219), based on the work of Marcin
+    Juszkiewicz.
+
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.hu>  Tue, 14 Aug 2012 12:24:28 +0000
+
 android-tools (4.1.1+git20120801-0ubuntu1) quantal; urgency=low
 
   * Updated upstream code:
diff -Nru android-tools-4.1.1+git20120801/debian/control android-tools-4.1.1+git20120801/debian/control
--- android-tools-4.1.1+git20120801/debian/control	2012-07-16 16:30:08.000000000 +0200
+++ android-tools-4.1.1+git20120801/debian/control	2012-08-14 15:10:10.000000000 +0200
@@ -1,8 +1,8 @@
 Source: android-tools
 Section: devel
 Priority: extra
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
+Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
+Uploaders: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
 Build-Depends: debhelper (>= 9), zlib1g-dev
 Standards-Version: 3.9.3
 Homepage: http://developer.android.com/guide/developing/tools/adb.html
diff -Nru android-tools-4.1.1+git20120801/debian/rules android-tools-4.1.1+git20120801/debian/rules
--- android-tools-4.1.1+git20120801/debian/rules	2012-07-16 16:14:25.000000000 +0200
+++ android-tools-4.1.1+git20120801/debian/rules	2012-08-14 15:09:43.000000000 +0200
@@ -1,14 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -34,8 +25,4 @@
 	cd core/fastboot && make CC=$(CC)
 
 override_dh_install:
-	install -d debian/android-tools-adb/usr/bin
-	install -m 0755 core/adb/adb debian/android-tools-adb/usr/bin
-	install -d debian/android-tools-fastboot/usr/bin
-	install -m 0755 core/fastboot/fastboot debian/android-tools-fastboot/usr/bin
-	dh_installman -p android-tools-adb debian/adb.1
+	dh_install --sourcedir=.

Reply to: