From c4e3b76070a6732ec7f8655066ac112fd26d725f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 22 Sep 2014 10:08:16 -0700 Subject: [PATCH 01/10] Quote deleted directory --- script/mkdeb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/mkdeb b/script/mkdeb index 53f0ec338..449a08a5b 100755 --- a/script/mkdeb +++ b/script/mkdeb @@ -33,4 +33,4 @@ cp "$ICON_FILE" "$TARGET/usr/share/pixmaps" dpkg-deb -b "$TARGET" mv "$TARGET_ROOT/atom-$VERSION-$ARCH.deb" "$DEB_PATH" -rm -rf $TARGET_ROOT +rm -rf "$TARGET_ROOT" From 6b23479c3fb3ce9f7997a9995fbf80c8352c249d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 22 Sep 2014 10:08:39 -0700 Subject: [PATCH 02/10] Use FILE_MODE variable --- script/mkdeb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/mkdeb b/script/mkdeb index 449a08a5b..084b9734b 100755 --- a/script/mkdeb +++ b/script/mkdeb @@ -16,7 +16,7 @@ DEB_PATH="$6" FILE_MODE=755 TARGET_ROOT="`mktemp -d`" -chmod 755 "$TARGET_ROOT" +chmod $FILE_MODE "$TARGET_ROOT" TARGET="$TARGET_ROOT/atom-$VERSION-$ARCH" mkdir -m $FILE_MODE -p "$TARGET/usr" From c178ac3aa6571c3897eece178567649be8e59c5b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 22 Sep 2014 10:13:13 -0700 Subject: [PATCH 03/10] Run dpkg-deb using fakeroot --- script/mkdeb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/mkdeb b/script/mkdeb index 084b9734b..7b91049f7 100755 --- a/script/mkdeb +++ b/script/mkdeb @@ -31,6 +31,6 @@ cp "$DESKTOP_FILE" "$TARGET/usr/share/applications" mkdir -m $FILE_MODE -p "$TARGET/usr/share/pixmaps" cp "$ICON_FILE" "$TARGET/usr/share/pixmaps" -dpkg-deb -b "$TARGET" +fakeroot dpkg-deb -b "$TARGET" mv "$TARGET_ROOT/atom-$VERSION-$ARCH.deb" "$DEB_PATH" rm -rf "$TARGET_ROOT" From ad9b5e5b8dd8a0f4a89eb6f7d7462014806b23bc Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 23 Sep 2014 11:07:38 -0700 Subject: [PATCH 04/10] Add extended description --- resources/linux/debian/control.in | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/linux/debian/control.in b/resources/linux/debian/control.in index 5d8812124..bd8c83c49 100644 --- a/resources/linux/debian/control.in +++ b/resources/linux/debian/control.in @@ -6,3 +6,4 @@ Architecture: <%= arch %> Installed-Size: <%= installedSize %> Maintainer: <%= maintainer %> Description: <%= description %> + Atom is a free and open source text editor that is modern, approachable, and hackable to the core. From 0bdddc955f2d6f7519dd54b0ec399fbd61ee56e8 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 23 Sep 2014 11:17:56 -0700 Subject: [PATCH 05/10] Remove executable bit from .node files --- script/mkdeb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/script/mkdeb b/script/mkdeb index 7b91049f7..7464f9341 100755 --- a/script/mkdeb +++ b/script/mkdeb @@ -31,6 +31,9 @@ cp "$DESKTOP_FILE" "$TARGET/usr/share/applications" mkdir -m $FILE_MODE -p "$TARGET/usr/share/pixmaps" cp "$ICON_FILE" "$TARGET/usr/share/pixmaps" +# Remove executable bit from .node files +find "$TARGET" -type f -name "*.node" -exec chmod a-x {} \; + fakeroot dpkg-deb -b "$TARGET" mv "$TARGET_ROOT/atom-$VERSION-$ARCH.deb" "$DEB_PATH" rm -rf "$TARGET_ROOT" From 0be03c8d9c1a69d3ea5bb4df7026dfb2c50070e0 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 23 Sep 2014 11:48:40 -0700 Subject: [PATCH 06/10] Copy LICENSE.md to /usr/share/doc/atom/copyright --- script/mkdeb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/script/mkdeb b/script/mkdeb index 7464f9341..24786a640 100755 --- a/script/mkdeb +++ b/script/mkdeb @@ -31,6 +31,10 @@ cp "$DESKTOP_FILE" "$TARGET/usr/share/applications" mkdir -m $FILE_MODE -p "$TARGET/usr/share/pixmaps" cp "$ICON_FILE" "$TARGET/usr/share/pixmaps" +# Copy generated LICENSE.md to /usr/share/doc/atom/copyright +mkdir -m $FILE_MODE -p "$TARGET/usr/share/doc/atom" +cp "$TARGET/usr/share/atom/resources/app/LICENSE.md" "$TARGET/usr/share/doc/atom/copyright" + # Remove executable bit from .node files find "$TARGET" -type f -name "*.node" -exec chmod a-x {} \; From 4c3ac8e6eccd1bc5ba8fd08a1052c59ea6b0ca8b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 23 Sep 2014 11:59:22 -0700 Subject: [PATCH 07/10] Add python dependency --- resources/linux/debian/control.in | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/linux/debian/control.in b/resources/linux/debian/control.in index bd8c83c49..f337e1b6a 100644 --- a/resources/linux/debian/control.in +++ b/resources/linux/debian/control.in @@ -1,5 +1,6 @@ Package: <%= name %> Version: <%= version %> +Depends: python (>= 2.6) Section: <%= section %> Priority: optional Architecture: <%= arch %> From 97b742cb1d48bdaf2f916a245ae6f55bbc896c34 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 23 Sep 2014 12:07:08 -0700 Subject: [PATCH 08/10] Add initial lintian overrides --- resources/linux/debian/lintian-overrides | 1 + script/mkdeb | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 resources/linux/debian/lintian-overrides diff --git a/resources/linux/debian/lintian-overrides b/resources/linux/debian/lintian-overrides new file mode 100644 index 000000000..242952cb0 --- /dev/null +++ b/resources/linux/debian/lintian-overrides @@ -0,0 +1 @@ +atom: unstripped-binary-or-object diff --git a/script/mkdeb b/script/mkdeb index 24786a640..272fe23f3 100755 --- a/script/mkdeb +++ b/script/mkdeb @@ -35,6 +35,10 @@ cp "$ICON_FILE" "$TARGET/usr/share/pixmaps" mkdir -m $FILE_MODE -p "$TARGET/usr/share/doc/atom" cp "$TARGET/usr/share/atom/resources/app/LICENSE.md" "$TARGET/usr/share/doc/atom/copyright" +# Add lintian overrides +mkdir -m $FILE_MODE -p "$TARGET/usr/share/lintian/overrides" +cp "$ROOT/resources/linux/debian/lintian-overrides" "$TARGET/usr/share/lintian/overrides/atom" + # Remove executable bit from .node files find "$TARGET" -type f -name "*.node" -exec chmod a-x {} \; From 26f3bde0e6993c705cf4d84f2d36eff3dfd5b71d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 23 Sep 2014 12:10:18 -0700 Subject: [PATCH 09/10] Add more lintian overrides --- resources/linux/debian/lintian-overrides | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/linux/debian/lintian-overrides b/resources/linux/debian/lintian-overrides index 242952cb0..8a33af0a7 100644 --- a/resources/linux/debian/lintian-overrides +++ b/resources/linux/debian/lintian-overrides @@ -1 +1,7 @@ +atom: arch-dependent-file-in-usr-share +atom: changelog-file-missing-in-native-package +atom: copyright-file-contains-full-apache-2-license +atom: copyright-should-refer-to-common-license-file-for-apache-2 +atom: embedded-library +atom: package-installs-python-bytecode atom: unstripped-binary-or-object From c6d6fb3b7acaba7861f188aa8b6b6306d2a386a2 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 23 Sep 2014 12:12:39 -0700 Subject: [PATCH 10/10] Add libc6 to Depends section --- resources/linux/debian/control.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/linux/debian/control.in b/resources/linux/debian/control.in index f337e1b6a..457955647 100644 --- a/resources/linux/debian/control.in +++ b/resources/linux/debian/control.in @@ -1,6 +1,6 @@ Package: <%= name %> Version: <%= version %> -Depends: python (>= 2.6) +Depends: python (>= 2.6), libc6 Section: <%= section %> Priority: optional Architecture: <%= arch %>