Skip to content

Commit 1101bd0

Browse files
committed
Revert "nemo-dropbox: Re-add the install script and associated files to fix"
This reverts commit 8fe6a2d. If we do this we need to not conflict with dropbox/nautilus-dropbox, either by replacing/breaking these packages or by renaming our dropbox to nemo-dropbox in /usr/bin and /usr/share/applications.. it's messy. The original issue we were trying to fix was that dropbox update in our postinst was hanging when called without a display.. but it turns out we don't need to call it, so we'll just remove it in the next commit.
1 parent bc05b45 commit 1101bd0

File tree

12 files changed

+6
-2892
lines changed

12 files changed

+6
-2892
lines changed

nemo-dropbox/Makefile.am

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1 @@
1-
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
2-
3-
bin_SCRIPTS = dropbox
4-
CLEANFILES = $(bin_SCRIPTS) dropbox.1 dropbox.txt
5-
EXTRA_DIST = dropbox.in build_dropbox.py dropbox.txt.in docgen.py rst2man.py
6-
man_MANS = dropbox.1
7-
8-
dropbox: dropbox.in build_dropbox.py
9-
python3 build_dropbox.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox
10-
chmod +x dropbox
11-
12-
dropbox.1: dropbox.txt.in dropbox docgen.py
13-
python3 docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt
14-
$(RST2MAN) dropbox.txt > dropbox.1
15-
161
SUBDIRS = data src

nemo-dropbox/build_dropbox.py

Lines changed: 0 additions & 29 deletions
This file was deleted.

nemo-dropbox/configure.ac

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -29,35 +29,6 @@ fi
2929
PKG_CHECK_MODULES(NEMO, libnemo-extension >= $NEMO_REQUIRED)
3030
PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
3131

32-
AC_PATH_PROG([PYTHON3], [python3])
33-
34-
AC_PATH_PROG([RST2MAN], [rst2man], [python3 rst2man.py])
35-
AC_SUBST(RST2MAN)
36-
37-
# define module checking macro
38-
AC_DEFUN([PYTHON3_CHECK_MODULE], [
39-
AC_MSG_CHECKING([for $1 on python3])
40-
41-
cat <<EOF | python3
42-
try:
43-
import $2
44-
except:
45-
exit(1)
46-
else:
47-
exit(0)
48-
EOF
49-
50-
if test $? -ne 0; then
51-
AC_MSG_RESULT([no])
52-
AC_MSG_ERROR([couldn't find $1])
53-
else
54-
AC_MSG_RESULT([yes])
55-
fi
56-
])
57-
58-
PYTHON3_CHECK_MODULE(docutils, docutils)
59-
PYTHON3_CHECK_MODULE(gi, gi)
60-
6132
# Make dependency CFLAGS and LIBS available
6233
AC_SUBST(NEMO_CFLAGS)
6334
AC_SUBST(NEMO_LIBS)

nemo-dropbox/data/Makefile.am

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
applicationdir = $(datadir)/applications
2-
application_DATA = dropbox.desktop
3-
4-
EXTRA_DIST = $(application_DATA)
5-
61
SUBDIRS = icons emblems

nemo-dropbox/data/dropbox.desktop

Lines changed: 0 additions & 11 deletions
This file was deleted.

nemo-dropbox/debian/compat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8

nemo-dropbox/debian/control

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@ Source: nemo-dropbox
22
Section: non-free/gnome
33
Priority: optional
44
Maintainer: Clement Lefebvre <[email protected]>
5-
Build-Depends: debhelper-compat (= 11),
6-
dh-python,
5+
Build-Depends: debhelper (>= 9),
76
libnemo-extension-dev (>= 1.0.0),
87
libglib2.0-dev (>= 2.14.0),
9-
python3-all,
10-
python3-docutils,
11-
python3-gi
8+
dh-autoreconf,
129
Standards-Version: 3.9.6
1310
XS-Autobuild: yes
1411
Homepage: http://www.dropbox.com/
@@ -18,9 +15,9 @@ Architecture: i386 amd64
1815
Depends: nemo,
1916
policykit-1,
2017
procps,
21-
python3-gi,
2218
${shlibs:Depends},
23-
${misc:Depends}
19+
${misc:Depends},
20+
dropbox
2421
Description: Dropbox integration for Nemo
2522
Nemo Dropbox is an extension that integrates the Dropbox web service with
2623
your Cinnamon Desktop.

nemo-dropbox/debian/rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/make -f
22

33
%:
4-
dh $@ --with=python3
4+
dh $@ --with=autoreconf
55

66
override_dh_autoreconf:
77
dh_autoreconf --as-needed

nemo-dropbox/docgen.py

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)