Bug#900816: cdargs: diff for NMU version 1.35-11.1

[Mike Miller]

On Mon, Jul 23, 2018 at 20:27:04 +0800, David Bremner wrote:
> I've prepared an NMU for cdargs (versioned as 1.35-11.1) and
> uploaded it to DELAYED/05. Please feel free to tell me if I
> should delay it longer.

Thank you for the fix, this is fine with me.

I did get around to installing emacs/experimental so far, but didn't
have time to look into the reason for the error.

-- 
mike


signature.asc
Description: PGP signature

Bug#900816: cdargs: diff for NMU version 1.35-11.1

[David Bremner]

Control: tags 900816 + patch
Control: tags 900816 + pending

Dear maintainer,

I've prepared an NMU for cdargs (versioned as 1.35-11.1) and
uploaded it to DELAYED/05. Please feel free to tell me if I
should delay it longer.
diff -Nru cdargs-1.35/debian/cdargs.emacsen-install cdargs-1.35/debian/cdargs.emacsen-install
--- cdargs-1.35/debian/cdargs.emacsen-install	2016-12-25 09:09:07.0 +0800
+++ cdargs-1.35/debian/cdargs.emacsen-install	2018-07-23 18:45:30.0 +0800
@@ -14,7 +14,9 @@
 # Create symlinks to the .el files (see section 6E in debian-emacs
 # polcy).  This makes complation easy, and also allows find-function
 # and find-library to work properly.
-(cd ${elc_dir} && cp -s ../../../emacs/site-lisp/cdargs/*.el .)
+if [ ${FLAVOR} != "emacs" ]; then
+(cd ${elc_dir} && cp -s ../../../emacs/site-lisp/cdargs/*.el .)
+fi
 
 # Byte compile them
 (cd ${elc_dir} && ${FLAVOR} ${byte_compile_options} *.el > /dev/null 2>&1)
diff -Nru cdargs-1.35/debian/cdargs.emacsen-remove cdargs-1.35/debian/cdargs.emacsen-remove
--- cdargs-1.35/debian/cdargs.emacsen-remove	2016-12-25 09:12:56.0 +0800
+++ cdargs-1.35/debian/cdargs.emacsen-remove	2018-07-23 18:47:15.0 +0800
@@ -8,7 +8,11 @@
 
 echo remove/cdargs: purging byte-compiled files for ${FLAVOR}
 rm -f ${elc_dir}/*.elc
-rm -f ${elc_dir}/*.el
+
+if [ ${FLAVOR} != "emacs" ]; then
+rm -f ${elc_dir}/*.el
+fi
+
 if test -e ${elc_dir}; then
   rmdir --ignore-fail-on-non-empty ${elc_dir}
 fi
diff -Nru cdargs-1.35/debian/changelog cdargs-1.35/debian/changelog
--- cdargs-1.35/debian/changelog	2016-12-25 09:38:04.0 +0800
+++ cdargs-1.35/debian/changelog	2018-07-23 18:47:15.0 +0800
@@ -1,3 +1,11 @@
+cdargs (1.35-11.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Modify cdargs.emacsen-{install,remove} to handle unversioned emacs.
+(Closes: #900816).
+
+ -- David Bremner   Mon, 23 Jul 2018 18:47:15 +0800
+
 cdargs (1.35-11) unstable; urgency=medium
 
   * Bump debhelper compatibility level to 10