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

RFS: symlinks (updated package, second attempt)



Dear mentors,

I am looking for a sponsor for the new version 1.2-6 of my package
"symlinks".

It builds this binary package:
symlinks   - scan/change symbolic links

Detailed description:

,----
|  Symlinks scans directories for symbolic links and lists them on
|  stdout. Each link is prefixed with a classification of relative,
|  absolute, dangling, messy, lengthy or other_fs.
|  
|  Symlinks can also convert absolute links (within the same filesystem)
|  to relative links and can delete messy and dangling links.
`----

There is one overridden lintian warning and two remarks shown at the
"pedantic" level.

The upload would fix bug 61140, a bug that is more than nine years old.
I have also switched to using quilt as a patch system and to dh for
minimizing debian/rules; the attached diff shows the changes against the
previous version after the patches have been applied.

The package can be found on mentors.debian.net:
- URL: http://mentors.debian.net/debian/pool/main/s/symlinks
- Source repository: deb-src http://mentors.debian.net/debian unstable main contrib non-free
- dget http://mentors.debian.net/debian/pool/main/s/symlinks/symlinks_1.2-6.dsc

I would be glad if someone uploaded this package for me.

Regards,
        Sven

diff -urN a/debian/README.source b/debian/README.source
--- a/debian/README.source	1970-01-01 01:00:00.000000000 +0100
+++ b/debian/README.source	2009-09-18 13:14:24.000000000 +0200
@@ -0,0 +1,2 @@
+This package uses quilt for any modifications to the upstream source.
+Please refer to /usr/share/doc/quilt/README.source for more information.
diff -urN a/debian/changelog b/debian/changelog
--- a/debian/changelog	2009-09-18 13:14:03.000000000 +0200
+++ b/debian/changelog	2009-09-18 13:14:24.000000000 +0200
@@ -1,3 +1,16 @@
+symlinks (1.2-6) unstable; urgency=low
+
+  * Use get_current_dir_name() instead of getcwd() to ensure correct
+    shortening if the path “symlinks” operates on contains itself a
+    symlink (Closes: #61140).  Thanks to Michael Schuerig.
+  * Use quilt as a patch system, add debian/README.source as
+    recommended by Policy §4.14.
+  * Build with dh to minimize debian/rules.
+  * Bump Standards-Version to 3.8.3, no further changes needed.
+  * Add Vcs-Browser and Vcs-Git fields to debian/control.
+
+ -- Sven Joachim <svenjoac@gmx.de>  Fri, 18 Sep 2009 12:51:27 +0200
+
 symlinks (1.2-5) unstable; urgency=low
 
   * New maintainer (Closes: #486001).
diff -urN a/debian/control b/debian/control
--- a/debian/control	2009-09-18 13:14:03.000000000 +0200
+++ b/debian/control	2009-09-18 13:14:24.000000000 +0200
@@ -2,12 +2,14 @@
 Section: utils
 Priority: optional
 Maintainer: Sven Joachim <svenjoac@gmx.de>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~)
+Standards-Version: 3.8.3
+Vcs-Browser: http://git.debian.org/?p=users/joachim-guest/symlinks.git
+Vcs-Git: git://git.debian.org/users/joachim-guest/symlinks.git
 
 Package: symlinks
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: scan/change symbolic links
  Symlinks scans directories for symbolic links and lists
  them on stdout. Each link is prefixed with a classification
diff -urN a/debian/rules b/debian/rules
--- a/debian/rules	2009-09-18 13:14:03.000000000 +0200
+++ b/debian/rules	2009-09-18 13:14:24.000000000 +0200
@@ -1,47 +1,13 @@
 #!/usr/bin/make -f
 
-# export DH_VERBOSE=1
-
-CFLAGS = -Wall -g
+CFLAGS = -Wall -g -D_GNU_SOURCE
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
 	CFLAGS += -O2
 endif
 
-build: build-stamp
-
-build-stamp:
-	dh_testdir
-	$(MAKE) CFLAGS="$(CFLAGS)" prefix=/usr
-	touch $@
-
-clean:
-	dh_testdir
-	$(MAKE) clean
-	dh_clean
-
-binary-indep:
-# Nothing to do here.
-
-binary-arch: build
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	dh_installdocs symlinks.lsm
-	dh_installchangelogs
-	dh_install symlinks usr/bin
-	dh_installman symlinks.8 
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_shlibdeps
-	dh_lintian
-	dh_gencontrol
-	dh_installdeb
-	dh_md5sums
-	dh_builddeb
-
-binary:	binary-indep binary-arch
+override_dh_auto_install:
 
-.PHONY: binary binary-arch binary-indep clean checkroot
+%:
+	dh --with quilt $@
diff -urN a/debian/symlinks.docs b/debian/symlinks.docs
--- a/debian/symlinks.docs	1970-01-01 01:00:00.000000000 +0100
+++ b/debian/symlinks.docs	2009-09-18 13:14:24.000000000 +0200
@@ -0,0 +1 @@
+symlinks.lsm
diff -urN a/debian/symlinks.install b/debian/symlinks.install
--- a/debian/symlinks.install	1970-01-01 01:00:00.000000000 +0100
+++ b/debian/symlinks.install	2009-09-18 13:14:24.000000000 +0200
@@ -0,0 +1 @@
+symlinks /usr/bin
diff -urN a/debian/symlinks.manpages b/debian/symlinks.manpages
--- a/debian/symlinks.manpages	1970-01-01 01:00:00.000000000 +0100
+++ b/debian/symlinks.manpages	2009-09-18 13:14:24.000000000 +0200
@@ -0,0 +1 @@
+symlinks.8
diff -urN a/symlinks.c b/symlinks.c
--- a/symlinks.c	2009-09-18 13:14:03.000000000 +0200
+++ b/symlinks.c	2009-09-18 13:14:44.318757077 +0200
@@ -303,7 +303,12 @@
 
 int main(int argc, char **argv)
 {
+#ifdef _GNU_SOURCE
+	static char path[PATH_MAX+2];
+	char* cwd = get_current_dir_name();
+#else
 	static char path[PATH_MAX+2], cwd[PATH_MAX+2];
+#endif
 	int dircount = 0;
 	char c, *p;
 
@@ -312,8 +317,13 @@
         else
                 progname++;
 
+#ifdef _GNU_SOURCE
+	if (NULL == cwd) {
+		fprintf(stderr,"get_current_dir_name() failed\n");
+#else
 	if (NULL == getcwd(cwd,PATH_MAX)) {
 		fprintf(stderr,"getcwd() failed\n");
+#endif
 		return (1);
 	}
 	if (!*cwd || cwd[strlen(cwd)-1] != '/')

Attachment: pgpW0X3M3L0y1.pgp
Description: PGP signature


Reply to: