This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository androidsdk-tools.
commit b9caa82fcdcc8cd24a2f87c6d88df69593712e8e Author: Jakub Adam <[email protected]> Date: Sat Sep 7 16:54:19 2013 +0200 Imported Debian patch 22.2+git20130830~92d25d6-1 --- debian/androidsdk-hierarchyviewer.install | 2 +- debian/androidsdk-uiautomatorviewer.install | 2 +- debian/changelog | 10 --- debian/control | 82 +++++++--------------- debian/libandroidsdk-common-java.install | 2 +- debian/libandroidsdk-ddmlib-java.install | 2 +- debian/libandroidsdk-ddmuilib-java.install | 2 +- .../libandroidsdk-hierarchyviewerlib-java.install | 2 +- debian/libandroidsdk-sdklib-java.install | 2 +- debian/libandroidsdk-sdkstats-java.install | 2 +- debian/rules | 3 +- 11 files changed, 33 insertions(+), 78 deletions(-) diff --git a/debian/androidsdk-hierarchyviewer.install b/debian/androidsdk-hierarchyviewer.install index a3fe0fc..4f10a24 100644 --- a/debian/androidsdk-hierarchyviewer.install +++ b/debian/androidsdk-hierarchyviewer.install @@ -1,3 +1,3 @@ androidsdk-hierarchyviewer.jar usr/share/java -debian/hierarchyviewer.desktop usr/share/applications hierarchyviewer2/app/etc/hierarchyviewer usr/bin +debian/hierarchyviewer.desktop usr/share/applications diff --git a/debian/androidsdk-uiautomatorviewer.install b/debian/androidsdk-uiautomatorviewer.install index 88da2f0..9629986 100644 --- a/debian/androidsdk-uiautomatorviewer.install +++ b/debian/androidsdk-uiautomatorviewer.install @@ -1,2 +1,2 @@ -debian/tmp/bnd/androidsdk-uiautomatorviewer.jar usr/share/java +androidsdk-uiautomatorviewer.jar usr/share/java uiautomatorviewer/etc/uiautomatorviewer usr/bin diff --git a/debian/changelog b/debian/changelog index e6c4602..b15696c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,3 @@ -androidsdk-tools (22.2+git20130830~92d25d6-2) unstable; urgency=medium - - * Team upload. - * Transition to bnd 2.1.0. - * Declare compliance with Debian Policy 3.9.6. - * Vcs-Browser: Switch to cgit and https. - * wrap-and-sort -sa. - - -- Markus Koschany <[email protected]> Thu, 19 Nov 2015 14:49:15 +0100 - androidsdk-tools (22.2+git20130830~92d25d6-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 9a123e5..132538e 100644 --- a/debian/control +++ b/debian/control @@ -2,43 +2,28 @@ Source: androidsdk-tools Section: devel Priority: extra Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: - Stefan Handschuh <[email protected]>, +Uploaders: Stefan Handschuh <[email protected]>, Jakub Adam <[email protected]> -Build-Depends: - cdbs, - debhelper (>=9), - javahelper -Build-Depends-Indep: - bnd (>= 2.1.0), - default-jdk, - eclipse-rcp (>= 3.8.1), - libguava-java (>= 13.0.1), - libjfreechart-swt-java, - libkxml2-java, - libswt-gtk-3-java, - perl -Standards-Version: 3.9.6 +Build-Depends: debhelper (>=9), cdbs, javahelper +Build-Depends-Indep: default-jdk, bnd, libswt-gtk-3-java, libjfreechart-swt-java, + eclipse-rcp (>= 3.8.1), libguava-java (>= 13.0.1), libkxml2-java, perl +Standards-Version: 3.9.4 Homepage: http://developer.android.com/tools/help/index.html Vcs-Git: git://anonscm.debian.org/pkg-java/androidsdk-tools.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/androidsdk-tools.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/androidsdk-tools.git;a=summary Package: libandroidsdk-common-java Section: java Architecture: all -Depends: - ${java:Depends}, - ${misc:Depends} +Depends: ${java:Depends}, ${misc:Depends} Description: Android sdk tools common library Common library used by other android sdk tools. Package: libandroidsdk-sdklib-java Section: java Architecture: all -Depends: - libandroidsdk-common-java (= ${binary:Version}), - ${java:Depends}, - ${misc:Depends} +Depends: libandroidsdk-common-java (= ${binary:Version}), + ${java:Depends}, ${misc:Depends} Description: Android SDKlib The Android SDKlib contains the resource assembler that compiles the static resource files of an Android project. @@ -48,10 +33,8 @@ Description: Android SDKlib Package: libandroidsdk-sdkstats-java Section: java Architecture: all -Depends: - libandroidsdk-common-java (= ${binary:Version}), - ${java:Depends}, - ${misc:Depends} +Depends: libandroidsdk-common-java (= ${binary:Version}), + ${java:Depends}, ${misc:Depends} Description: Sends Android SDK usage statistics to Google This library sends reports about usage of the Android SDK to the Google servers. Information can be used to help improving the @@ -62,9 +45,7 @@ Description: Sends Android SDK usage statistics to Google Package: libandroidsdk-swtmenubar-java Section: java Architecture: all -Depends: - ${java:Depends}, - ${misc:Depends} +Depends: ${java:Depends}, ${misc:Depends} Description: Android SDK OS menubar hook library This project provides a platform-specific way to hook into the default OS menu bar. @@ -75,10 +56,7 @@ Description: Android SDK OS menubar hook library Package: libandroidsdk-ddmlib-java Section: java Architecture: all -Depends: - android-tools-adb, - ${java:Depends}, - ${misc:Depends} +Depends: android-tools-adb, ${java:Depends}, ${misc:Depends} Description: Library for communicaton with connected Android devices Dalvik Debug Monitor Server provides a way to communicate via adb with Android devices connected through USB or running in emulator. @@ -86,10 +64,8 @@ Description: Library for communicaton with connected Android devices Package: libandroidsdk-ddmuilib-java Section: java Architecture: all -Depends: - libandroidsdk-ddmlib-java (= ${binary:Version}), - ${java:Depends}, - ${misc:Depends} +Depends: libandroidsdk-ddmlib-java (= ${binary:Version}), + ${java:Depends}, ${misc:Depends} Description: User interface library for ddmlib Dalvik Debug Monitor Server provides a way to communicate via adb with Android devices connected through USB or running in emulator. @@ -99,13 +75,11 @@ Description: User interface library for ddmlib Package: androidsdk-ddms Section: java Architecture: all -Depends: +Depends: libandroidsdk-swtmenubar-java (= ${binary:Version}), libandroidsdk-ddmlib-java (= ${binary:Version}), libandroidsdk-ddmuilib-java (= ${binary:Version}), libandroidsdk-sdkstats-java (= ${binary:Version}), - libandroidsdk-swtmenubar-java (= ${binary:Version}), - ${java:Depends}, - ${misc:Depends} + ${java:Depends}, ${misc:Depends} Description: Graphical debugging tool for Android Dalvik Debug Monitor is a tool for debugging Android applications. Among others, it provides these capabilities: @@ -123,10 +97,8 @@ Description: Graphical debugging tool for Android Package: libandroidsdk-hierarchyviewerlib-java Section: java Architecture: all -Depends: - libandroidsdk-ddmuilib-java (= ${binary:Version}), - ${java:Depends}, - ${misc:Depends} +Depends: libandroidsdk-ddmuilib-java (= ${binary:Version}), + ${java:Depends}, ${misc:Depends} Description: Android Hierarchy Viewer library Hierarchy Viewer allows you to debug and optimize your user interface. It provides a visual representation of the layout's view hierarchy @@ -136,12 +108,10 @@ Description: Android Hierarchy Viewer library Package: androidsdk-hierarchyviewer Section: java Architecture: all -Depends: +Depends: libandroidsdk-hierarchyviewerlib-java (= ${binary:Version}), libandroidsdk-common-java (= ${binary:Version}), - libandroidsdk-hierarchyviewerlib-java (= ${binary:Version}), libandroidsdk-swtmenubar-java (= ${binary:Version}), - ${java:Depends}, - ${misc:Depends} + ${java:Depends}, ${misc:Depends} Description: Tool to debug and optimize Android user interface Hierarchy Viewer allows you to debug and optimize your user interface. It provides a visual representation of the layout's View hierarchy @@ -154,9 +124,7 @@ Description: Tool to debug and optimize Android user interface Package: androidsdk-traceview Section: java Architecture: all -Depends: - ${java:Depends}, - ${misc:Depends} +Depends: ${java:Depends}, ${misc:Depends} Description: Tool to profile performance of Android applications Traceview is a graphical viewer for execution logs saved by your application. It can help you debug your application and profile its performance. @@ -164,11 +132,9 @@ Description: Tool to profile performance of Android applications Package: androidsdk-uiautomatorviewer Section: java Architecture: all -Depends: - libandroidsdk-common-java (= ${binary:Version}), +Depends: libandroidsdk-common-java (= ${binary:Version}), libandroidsdk-ddmlib-java (= ${binary:Version}), - ${java:Depends}, - ${misc:Depends} + ${java:Depends}, ${misc:Depends} Description: Tool to scan and analyze the UI components of an Android application The uiautomatorviewer tool provides a convenient visual interface to inspect the layout hierarchy and view the properties of the individual UI components diff --git a/debian/libandroidsdk-common-java.install b/debian/libandroidsdk-common-java.install index cb9f44c..47c2a23 100644 --- a/debian/libandroidsdk-common-java.install +++ b/debian/libandroidsdk-common-java.install @@ -1 +1 @@ -debian/tmp/bnd/androidsdk-common.jar usr/share/java/ +androidsdk-common.jar usr/share/java/ diff --git a/debian/libandroidsdk-ddmlib-java.install b/debian/libandroidsdk-ddmlib-java.install index 617c547..2f98713 100644 --- a/debian/libandroidsdk-ddmlib-java.install +++ b/debian/libandroidsdk-ddmlib-java.install @@ -1 +1 @@ -debian/tmp/bnd/androidsdk-ddmlib.jar usr/share/java/ +androidsdk-ddmlib.jar usr/share/java/ diff --git a/debian/libandroidsdk-ddmuilib-java.install b/debian/libandroidsdk-ddmuilib-java.install index 287682d..7759ae5 100644 --- a/debian/libandroidsdk-ddmuilib-java.install +++ b/debian/libandroidsdk-ddmuilib-java.install @@ -1 +1 @@ -debian/tmp/bnd/androidsdk-ddmuilib.jar usr/share/java/ +androidsdk-ddmuilib.jar usr/share/java/ diff --git a/debian/libandroidsdk-hierarchyviewerlib-java.install b/debian/libandroidsdk-hierarchyviewerlib-java.install index 294921c..c4afa03 100644 --- a/debian/libandroidsdk-hierarchyviewerlib-java.install +++ b/debian/libandroidsdk-hierarchyviewerlib-java.install @@ -1 +1 @@ -debian/tmp/bnd/androidsdk-hierarchyviewerlib.jar usr/share/java +androidsdk-hierarchyviewerlib.jar usr/share/java diff --git a/debian/libandroidsdk-sdklib-java.install b/debian/libandroidsdk-sdklib-java.install index 9628165..cd82bc3 100644 --- a/debian/libandroidsdk-sdklib-java.install +++ b/debian/libandroidsdk-sdklib-java.install @@ -1 +1 @@ -debian/tmp/bnd/androidsdk-sdklib.jar usr/share/java/ +androidsdk-sdklib.jar usr/share/java/ diff --git a/debian/libandroidsdk-sdkstats-java.install b/debian/libandroidsdk-sdkstats-java.install index fafc50a..46e8238 100644 --- a/debian/libandroidsdk-sdkstats-java.install +++ b/debian/libandroidsdk-sdkstats-java.install @@ -1 +1 @@ -debian/tmp/bnd/androidsdk-sdkstats.jar usr/share/java/ +androidsdk-sdkstats.jar usr/share/java/ diff --git a/debian/rules b/debian/rules index 47334a8..8fb6ac3 100755 --- a/debian/rules +++ b/debian/rules @@ -7,10 +7,9 @@ export CLASSPATH := androidsdk-common.jar:androidsdk-ddmlib.jar:androidsdk-ddmui POD2MAN := pod2man --center "Android SDK Tools" -r "Debian" common-post-build-indep:: - mkdir -p debian/tmp/bnd for BNDFILE in debian/*.bnd; do \ JARNAME=`basename $$BNDFILE .bnd`.jar; \ - bnd wrap --properties $$BNDFILE --output debian/tmp/bnd/`basename $$BNDFILE .bnd`.jar $$JARNAME; \ + bnd wrap -properties $$BNDFILE -output $$JARNAME $$JARNAME; \ done jar uf androidsdk-ddmuilib.jar -C ddms/ddmuilib/src/main/java images -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/androidsdk-tools.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
