diff -Nru dpkg-repack-1.41/debian/changelog dpkg-repack-1.43/debian/changelog
--- dpkg-repack-1.41/debian/changelog	2015-04-11 15:26:31.000000000 +0000
+++ dpkg-repack-1.43/debian/changelog	2016-02-29 08:03:10.000000000 +0000
@@ -1,3 +1,47 @@
+dpkg-repack (1.43) unstable; urgency=medium
+
+  * Fix variable name botched in a last-minute rebase.
+  * Add very basic unit test to check syntax failures.
+
+ -- Guillem Jover <guillem@debian.org>  Mon, 29 Feb 2016 09:03:09 +0100
+
+dpkg-repack (1.42) unstable; urgency=medium
+
+  * Use https for the debian/copyright Format URL.
+  * Remove ancient versioned Build-Depends on dpkg.
+  * Do not add spurious newlines to the binary control file.
+  * Ignore case when comparing all field names, although «dpkg -s» already
+    normalizes them for known ones.
+  * Use a proper non-deterministic temporary directory per package. This fixes
+    a possible security issue, and using --generate with multiple packages.
+  * Include the package name in the temporary directory, so that they
+    are easier to distinguish when operating on multiple packages with
+    --generate.
+  * Check immediately if we cannot get any package control information.
+  * Switch to use Dpkg::Control to handle the control data. Add a dependency
+    on libdpkg-perl.
+  * Add basic autopkgtest test cases.
+  * When using --generate, also print the error summary if the tree might
+    be broken due to processing errors.
+  * Automatically use fakeroot if available and not running as root.
+  * Add fakeroot to a Suggests field.
+  * Rename packagename to package-name in --help output.
+  * Remove duplicated program name prefix in generate Info message.
+    Thanks to Brian Beffa <brbsix@gmail.com>.
+  * Remove duplicated newline in Warn message.
+    Thanks to Brian Beffa <brbsix@gmail.com>.
+  * Fix grammatical errors and typos in man page and --help output.
+    Thanks to Brian Beffa <brbsix@gmail.com>.
+  * Add a --tag option to select what to mark as being repackaged.
+    Based on a patch by Brian Beffa <brbsix@gmail.com>. Closes: #788628
+  * Add a --tag value to mark the package version as repackaged.
+    Closes: #788627
+  * Switch git repository URLs from git:// to https:// in README and
+    debian/control Vcs-Git field.
+  * Bump Standard-Version to 3.9.7 (no changed needed).
+
+ -- Guillem Jover <guillem@debian.org>  Sun, 28 Feb 2016 23:10:41 +0100
+
 dpkg-repack (1.41) unstable; urgency=low
 
   * Actually fix the blank line insertion for the descriptor mangling.
diff -Nru dpkg-repack-1.41/debian/control dpkg-repack-1.43/debian/control
--- dpkg-repack-1.41/debian/control	2014-11-26 18:44:03.000000000 +0000
+++ dpkg-repack-1.43/debian/control	2016-02-29 08:02:46.000000000 +0000
@@ -1,17 +1,21 @@
 Source: dpkg-repack
 Section: admin
 Priority: optional
-Build-Depends: debhelper (>= 9), dpkg (>= 1.9.0)
 Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
 Uploaders: Guillem Jover <guillem@debian.org>
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg-repack.git
-Vcs-Git: git://anonscm.debian.org/dpkg/dpkg-repack.git
+Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg-repack.git
 Homepage: https://wiki.debian.org/Teams/Dpkg
+Build-Depends:
+ dpkg-dev (>= 1.17.14),
+ debhelper (>= 9.20141010),
+ libtest-strict-perl <!nocheck>,
 
 Package: dpkg-repack
 Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, libdpkg-perl
+Suggests: fakeroot
 Description: Debian package archiving tool
  dpkg-repack creates a .deb file out of a package that has already been
  installed. If any changes have been made to the package while it was
diff -Nru dpkg-repack-1.41/debian/copyright dpkg-repack-1.43/debian/copyright
--- dpkg-repack-1.41/debian/copyright	2015-04-11 15:26:31.000000000 +0000
+++ dpkg-repack-1.43/debian/copyright	2016-02-28 22:27:56.000000000 +0000
@@ -1,9 +1,9 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright:
  Copyright © 1996-2009 Joey Hess <joeyh@debian.org>
- Copyright © 2012,2014-2015 Guillem Jover <guillem@debian.org>
+ Copyright © 2012,2014-2016 Guillem Jover <guillem@debian.org>
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff -Nru dpkg-repack-1.41/debian/rules dpkg-repack-1.43/debian/rules
--- dpkg-repack-1.41/debian/rules	2014-11-26 04:45:46.000000000 +0000
+++ dpkg-repack-1.43/debian/rules	2016-02-29 08:02:46.000000000 +0000
@@ -13,6 +13,11 @@
 binary-indep:
 	dh_testroot
 	dh_prep
+
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	prove
+endif
+
 	dh_install
 	dh_installdocs
 	dh_installchangelogs
diff -Nru dpkg-repack-1.41/debian/tests/control dpkg-repack-1.43/debian/tests/control
--- dpkg-repack-1.41/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
+++ dpkg-repack-1.43/debian/tests/control	2015-07-22 19:11:19.000000000 +0000
@@ -0,0 +1,2 @@
+Tests: repack
+Depends: @, fakeroot
diff -Nru dpkg-repack-1.41/debian/tests/repack dpkg-repack-1.43/debian/tests/repack
--- dpkg-repack-1.41/debian/tests/repack	1970-01-01 00:00:00.000000000 +0000
+++ dpkg-repack-1.43/debian/tests/repack	2015-07-22 19:11:19.000000000 +0000
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+set -e
+set -u
+
+cmp_ctrlfile()
+{
+  local pkg=$1
+  local ctrl=$2
+
+  dpkg-query --control-show $pkg $ctrl >$ADTTMP/$pkg-inst.$ctrl
+  dpkg-deb --info $ADTTMP/${pkg}_*.deb $ctrl >$ADTTMP/$pkg-pack.$ctrl
+  diff -u $ADTTMP/$pkg-inst.$ctrl $ADTTMP/$pkg-pack.$ctrl
+}
+
+cmp_listfile()
+{
+  local pkg=$1
+  local ctrl=$2
+
+  dpkg-query --listfiles $pkg | sort >$ADTTMP/$pkg-inst.list
+  dpkg-deb --fsys-tarfile $ADTTMP/${pkg}_*.deb | tar -tf - | cut -c2- \
+    | sort >$ADTTMP/$pkg-pack.list
+  diff -u $ADTTMP/$pkg-inst.list $ADTTMP/$pkg-pack.list
+}
+
+test_pkgs="dpkg dpkg-repack"
+
+cd $ADTTMP
+fakeroot -u dpkg-repack $test_pkgs
+cd $OLDPWD
+
+for pkg in $test_pkgs; do
+  for ctrl in $(dpkg-query --control-list $pkg); do
+    cmp_ctrlfile $pkg $ctrl
+  done
+done
+
+cmp_ctrlfile dpkg conffiles
+
+# FIXME: check control file
+# FIXME: check diverted files
+# FIXME: check obsolete conffiles
+# FIXME: check --generate
+# FIXME: check --arch
+# FIXME: check --deb-option
+# FIXME: check --root
diff -Nru dpkg-repack-1.41/dpkg-repack dpkg-repack-1.43/dpkg-repack
--- dpkg-repack-1.41/dpkg-repack	2015-04-11 15:23:09.000000000 +0000
+++ dpkg-repack-1.43/dpkg-repack	2016-02-29 08:02:18.000000000 +0000
@@ -3,7 +3,7 @@
 # dpkg-repack puts humpty-dumpty back together again.
 #
 # Copyright © 1996-2006 Joey Hess <joeyh@debian.org>
-# Copyright © 2012,2014-2015 Guillem Jover <guillem@debian.org>
+# Copyright © 2012,2014-2016 Guillem Jover <guillem@debian.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,341 +22,352 @@
 use warnings;
 
 use File::stat;
+use File::Temp;
+use Dpkg::Path qw(find_command);
+use Dpkg::Control;
+use Dpkg::Control::Fields;
 use Getopt::Long;
 
-my $VERSION = '1.41';
+my $VERSION = '1.43';
 
 my $error_flag;
-my $dirty_flag;
-my $build_dir;
 my $rootdir;
 my $arch;
 my @deb_options;
 my $generate;
+my $tags = '';
+my %tag = (
+    description => 1,
+    version => 0,
+);
 
 sub Syntax {
-	print { *STDERR } <<USAGE;
-Usage: dpkg-repack [option...] packagename...
+    print { *STDERR } <<USAGE;
+Usage: dpkg-repack [option...] package-name...
 
 Options:
       --root=<dir>      Take package from filesystem rooted on <dir>.
-      --arch=<arch>     Force the parch to be built for architecture <arch>.
+      --arch=<arch>     Force the package to be built for architecture <arch>.
       --generate        Generate build directory but do not build deb.
+      --tag=<type>      Tag the package as being repackaged.
+                          Types: none, description, version, all.
   -d, --deb-option=<option>
                         Pass build <option> to dpkg-deb.
   -?, --help            Show this usage information.
       --version         Show the version.
 
-<packagename> is the name of the package(s) to attempt to repack.
+<package-name> is the name of the package(s) to attempt to repack.
 USAGE
 }
 
 sub Version {
-	print 'dpkg-repack ' . $VERSION . "\n";
+    print 'dpkg-repack ' . $VERSION . "\n";
 }
 
 sub Info {
-	print "dpkg-repack: @_\n";
+    print "dpkg-repack: @_\n";
 }
 
 sub Warn {
-	print { *STDERR } "dpkg-repack: @_\n";
+    print { *STDERR } "dpkg-repack: @_\n";
 }
 
 sub Error {
-	Warn @_;
-	$error_flag = 1;
+    Warn @_;
+    $error_flag = 1;
 }
 
 sub Die {
-	Error('Fatal Error:', @_);
-	CleanUp();
-	exit 1;
+    Error('Fatal Error:', @_);
+    exit 1;
 }
 
 # Run a system command, and print an error message if it fails.
 sub SafeSystem {
-	my $errormessage = pop @_;
+    my $errormessage = pop @_;
 
-	my $ret = system @_;
-	if (int($ret / 256) > 0) {
-		$errormessage = 'Error running: ' . join ' ', @_
-			if !$errormessage;
-		Error($errormessage);
-	}
+    my $ret = system @_;
+    if (int($ret / 256) > 0) {
+        $errormessage = 'Error running: ' . join ' ', @_
+            if !$errormessage;
+        Error($errormessage);
+    }
 }
 
-# Make the passed directory, print an error message if it fails.
-sub SafeMkdir {
-	my ($dir, $perms) = @_;
+sub SafeChmod {
+    my ($dir, $perms) = @_;
 
-	mkdir $dir, $perms or Error("Unable to make directory, \"$dir\": $!");
-	# mkdir doesn't do sticky bits and suidness.
-	chmod $perms, $dir or Error("Unable to change permissions on \"$dir\": $!");
+    chmod $perms, $dir or Error("Unable to change permissions on \"$dir\": $!");
 }
 
-# This removes the temporary directory where we built the package.
-sub CleanUp {
-	if ($dirty_flag) {
-		SafeSystem('rm', '-rf', $build_dir,
-		           "Unable to remove $build_dir ($!). Please remove it by hand.");
-	}
-	$dirty_flag = 0;
+# Make the passed directory, print an error message if it fails.
+sub SafeMkdir {
+    my ($dir, $perms) = @_;
+
+    mkdir $dir, $perms or Error("Unable to make directory, \"$dir\": $!");
+    # mkdir doesn't do sticky bits and suidness.
+    SafeChmod($dir, $perms);
 }
 
 # This makes the directories we will rebuild the package in.
 sub Make_Dirs {
-	$dirty_flag = 1;
+    my $pkgname = shift;
+    my %opts = (
+        TEMPLATE => "dpkg-repack.$pkgname.XXXXXX",
+        CLEANUP => !$generate,
+    );
+
+    my $dir = File::Temp->newdir(%opts);
+    SafeChmod($dir, 0755);
+    SafeMkdir("$dir/DEBIAN", 0755);
 
-	SafeMkdir $build_dir, 0755;
-	SafeMkdir "$build_dir/DEBIAN", 0755;
+    return $dir;
 }
 
 # Get package control file via dpkg -s.
-sub Extract_Control {
-	my $packagename = shift;
+sub Extract_Status {
+    my $pkgname = shift;
+
+    my $inst = Dpkg::Control->new(type => CTRL_FILE_STATUS);
 
-	my @control = qx{dpkg --root=$rootdir/ -s $packagename};
-	chomp foreach @control;
+    open my $fh, '-|', 'dpkg', "--root=$rootdir/", '-s', $pkgname
+        or Die "Unable to locate $pkgname in the package list.";
+    $inst->parse($fh, "dpkg status for $pkgname");
+    close $fh;
 
-	# Add something to the Description to mention dpkg-repack.
-	my $indesc = 0;
-	my $x;
-	for ($x = 0; $x < @control; $x++) {
-		if ($control[$x] =~ /^(\S+):/) {
-			last if $indesc; # end of description
-			$indesc = 1 if lc $1 eq 'description';
-		}
-	}
-	if ($indesc) {
-		my $date = qx'date -R';
-		chomp $date;
-		chomp $control[$x - 1];
-		$control[$x - 1] .= "\n";
-		$control[$x - 1] .= " .\n";
-		$control[$x - 1] .= " (Repackaged on $date by dpkg-repack.)";
-	}
-	
-	if ($arch) {
-		@control = grep { !/^Architecture:/ } @control;
-		push @control, "Architecture: $arch\n";
-	}
-
-	if (! grep { /^Status:\s+.*\s+installed/ } @control) {
-		Die "Package $packagename not fully installed";
-	}
-	@control = grep { !/^Status:\s+/ } @control;
-	push @control, "\n";
+    if ($inst->{Status} !~ m/^\S+\s+\S+\s+installed$/) {
+        Die "Package $pkgname not fully installed: $inst->{Status}";
+    }
 
-	return @control;
+    return $inst;
 }
 
-# Install the control file. Pass it the text of the file.
+# Install the control file from the installed package control information.
 sub Install_Control {
-	my ($packagename, @control) = @_;
+    my ($build_dir, $inst) = @_;
 
-	open my $control_fh, '>', "$build_dir/DEBIAN/control"
-		or Die "Can't write to $build_dir/DEBIAN/control";
+    my $ctrl = Dpkg::Control->new(type => CTRL_PKG_DEB);
 
-	my $skip = 0;
-	foreach (@control) {
-		# Remove the Conffiles stanza
-		if (/^(\S+):/) {
-			$skip = lc $1 eq 'conffiles';
-		}
-		print { $control_fh } "$_\n" unless $skip;
-	}
+    # XXX: Versions prior to dpkg 1.18.2 do not properly propagate the
+    # Maintainer field, workaround it here.
+    if (not field_is_allowed_in('Maintainer', CTRL_FILE_STATUS)) {
+        field_register('Maintainer', CTRL_PKG_DEB | CTRL_FILE_STATUS);
+    }
+
+    field_transfer_all($inst, $ctrl);
+
+    # Add something to the Description to mention dpkg-repack.
+    if ($tag{description}) {
+        my $date = qx'date -R';
+        chomp $date;
+
+        $ctrl->{Description} .= "\n";
+        $ctrl->{Description} .= "\n";
+        $ctrl->{Description} .= "(Repackaged on $date by dpkg-repack.)";
+    }
+    if ($tag{version}) {
+        $ctrl->{Version} .= '+repack';
+    }
+
+    if ($arch) {
+        $ctrl->{Architecture} = $arch;
+    }
 
-	close $control_fh;
-	SafeSystem 'chown', '0:0', "$build_dir/DEBIAN/control", '';
+    $ctrl->save("$build_dir/DEBIAN/control");
+    SafeSystem 'chown', '0:0', "$build_dir/DEBIAN/control", '';
 }
 
 # Install all the files in the DEBIAN directory. (Except control file and
 # file list file.)
 sub Install_DEBIAN {
-	my ($packagename, @conffiles) = @_;
+    my ($build_dir, $inst, @conffiles) = @_;
 
-	my @control_files;
-	open my $q_fh, '-|', "dpkg-query --admindir=$rootdir/var/lib/dpkg --control-path $packagename 2>/dev/null"
-		or Die "dpkg-query failed: $!";
-	while (my $fn = <$q_fh>) {
-		chomp $fn;
-		push @control_files, $fn;
-	}
-	close $q_fh;
-
-	foreach my $fn (@control_files) {
-		my ($basename) = $fn =~ m/^.*\.(.*?)$/;
-		SafeSystem 'cp', '-p', $fn, "$build_dir/DEBIAN/$basename", '';
-	}
-
-	# Conffiles have to be handled specially, because
-	# dpkg-query --control-path does not list the conffiles file.
-	# Also, we need to generate one that only contains conffiles
-	# that are still present on the filesystem.
-	if (@conffiles) {
-		open my $out_fh, '>', "$build_dir/DEBIAN/conffiles"
-			or Die "write conffiles: $!";
-		foreach (@conffiles) {
-			print { $out_fh } "$_\n";
-		}
-		close $out_fh;
-		SafeSystem 'chown', '0:0', "$build_dir/DEBIAN/conffiles", '';
-	}
+    my @control_files;
+    open my $q_fh, '-|', "dpkg-query --admindir=$rootdir/var/lib/dpkg --control-path $inst->{Package} 2>/dev/null"
+        or Die "dpkg-query failed: $!";
+    while (my $fn = <$q_fh>) {
+        chomp $fn;
+        push @control_files, $fn;
+    }
+    close $q_fh;
+
+    foreach my $fn (@control_files) {
+        my ($basename) = $fn =~ m/^.*\.(.*?)$/;
+        SafeSystem 'cp', '-p', $fn, "$build_dir/DEBIAN/$basename", '';
+    }
+
+    # Conffiles have to be handled specially, because dpkg-query --control-path
+    # does not list the conffiles file. Also, we need to generate one that only
+    # contains conffiles that are still present on the filesystem.
+    if (@conffiles) {
+        open my $out_fh, '>', "$build_dir/DEBIAN/conffiles"
+            or Die "write conffiles: $!";
+        foreach (@conffiles) {
+            print { $out_fh } "$_\n";
+        }
+        close $out_fh;
+        SafeSystem 'chown', '0:0', "$build_dir/DEBIAN/conffiles", '';
+    }
 }
 
 # This looks at the list of files in this package, and places them
 # all on the directory tree.
 sub Install_Files {
-	my ($packagename, @control) = @_;
+    my ($build_dir, $inst) = @_;
 
-	# There are two types of conffiles. Obsolete conffiles should be
-	# skipped, while other conffiles should be included if present.
-	my @conffiles = ();
-	my @obsolete_conffiles;
-	my $in_conffiles = 0;
-	foreach my $line (@control) {
-		if ($line =~ /^Conffiles:/) {
-			$in_conffiles = 1;
-		}
-		elsif ($in_conffiles && $line =~ /^ (.*)\s+([^\s]+)\s+obsolete$/) {
-			push @obsolete_conffiles, $1;
-		}
-		elsif ($in_conffiles && $line =~ /^ (.*)\s+([^\s]+)$/) {
-			push @conffiles, $1;
-		}
-		else {
-			$in_conffiles = 0;
-		}
-	}
-
-	# I need a list of all the files, for later lookups
-	# when I test to see where symlinks point to.
-	# Note that because I parse the output of the command (for
-	# diversions, below) it's important to make sure it runs with English
-	# language output.
-	my $lc_all = $ENV{LC_ALL};
-	$ENV{LC_ALL} = 'C';
-	my @filelist = split /\n/, qx{dpkg --root=$rootdir/ -L $packagename};
-	$ENV{LC_ALL} = $lc_all if defined $lc_all; # important to reset it.
-
-	# Set up a hash for easy lookups.
-	my %filelist = map { $_ => 1 } @filelist;
-
-	my $fn;
-	for (my $x = 0; $x <= $#filelist; $x++) {
-		my $origfn = $filelist[$x];
-
-		# dpkg -L spits out extra lines to report diversions.
-		# we have to parse those (ugly..), to find out where the
-		# file was diverted to, and use the diverted file.
-		if (defined $filelist[$x + 1] &&
-		    ($filelist[$x + 1] =~ m/locally diverted to: (.*)/ ||
-		     $filelist[$x + 1] =~ m/diverted by .*? to: (.*)/)) {
-			$fn = "$rootdir/$1";
-			$x++; # skip over that line.
-		}
-		elsif ($origfn =~ m/package diverts others to: (.*)/) {
-			# not a file at all, skip over it
-			next;
-		}
-		else {
-			$fn = $rootdir . $origfn;
-		}
-
-		if (grep { $_ eq $fn } @obsolete_conffiles) {
-			Warn "Skipping obsolete conffile $fn\n";
-			next;
-		}
-
-		if (!-e $fn && !-l $fn) {
-			Error "File not found: $fn" unless grep { $_ eq $fn } @conffiles;
-		}
-		elsif ((-d $fn and not -l $fn) or
-		       (-d $fn and -l $fn and not $filelist{readlink($fn)}
-		        and ($x + 1 <= $#filelist and $filelist[$x + 1] =~ m/^\Q$origfn\E\//))) {
-			# See the changelog for version 0.17 for an
-			# explanation of what I'm doing above with
-			# directory symlinks. I rely on the order of the
-			# filelist listing parent directories first, and 
-			# then their contents.
-			# There has to be a better way to do this!
-			my $f = '';
-			foreach my $dir (split(m/\/+/, $origfn)) {
-				$f .= "/$dir";
-				next if -d $build_dir . $f;
-				my $st = stat($rootdir . $f);
-				SafeMkdir "$build_dir/$f", $st->mode;
-				chown($st->uid, $st->gid, "$build_dir/$f");
-			}
-		}
-		elsif (-p $fn) {
-			# Copy a named pipe with cp -a.
-			SafeSystem 'cp', '-a', $fn, "$build_dir/$origfn", '';
-		}
-		else {
-			SafeSystem 'cp', '-pd', $fn, "$build_dir/$origfn", '';
-		}
-	}
+    # There are two types of conffiles. Obsolete conffiles should be
+    # skipped, while other conffiles should be included if present.
+    my @conffiles = ();
+    my @obsolete_conffiles;
+    foreach my $line (split /\n/, $inst->{Conffiles} // '') {
+        if ($line =~ /^(.*)\s+(\S+)\s+obsolete$/) {
+            push @obsolete_conffiles, $1;
+        } elsif ($line =~ /^(.*)\s+(\S+)$/) {
+            push @conffiles, $1;
+        }
+    }
+
+    # We need a list of all the files, for later lookups when we test to
+    # see where symlinks point to. Note that because we parse the output
+    # of the command (for diversions, below) it's important to make sure
+    # it runs with English language output.
+    my $lc_all = $ENV{LC_ALL};
+    $ENV{LC_ALL} = 'C';
+    my @filelist = split /\n/, qx{dpkg --root=$rootdir/ -L $inst->{Package}};
+    $ENV{LC_ALL} = $lc_all if defined $lc_all; # important to reset it.
+
+    # Set up a hash for easy lookups.
+    my %filelist = map { $_ => 1 } @filelist;
+
+    my $fn;
+    for (my $x = 0; $x <= $#filelist; $x++) {
+        my $origfn = $filelist[$x];
+
+        # dpkg -L spits out extra lines to report diversions. We have to
+        # parse those (ugly), to find out where the file was diverted to,
+        # and use the diverted file.
+        if (defined $filelist[$x + 1] &&
+            ($filelist[$x + 1] =~ m/locally diverted to: (.*)/ ||
+             $filelist[$x + 1] =~ m/diverted by .*? to: (.*)/)) {
+            $fn = "$rootdir/$1";
+            # Skip over that line.
+            $x++;
+        } elsif ($origfn =~ m/package diverts others to: (.*)/) {
+            # Not a file at all, skip over it.
+            next;
+        } else {
+            $fn = $rootdir . $origfn;
+        }
+
+        if (grep { $_ eq $fn } @obsolete_conffiles) {
+            Warn("Skipping obsolete conffile $fn");
+            next;
+        }
+
+        if (!-e $fn && !-l $fn) {
+            Error "File not found: $fn" unless grep { $_ eq $fn } @conffiles;
+        } elsif ((-d $fn and not -l $fn) or
+                 (-d $fn and -l $fn and not $filelist{readlink($fn)} and
+                  ($x + 1 <= $#filelist and $filelist[$x + 1] =~ m/^\Q$origfn\E\//))) {
+            # If the package contains a file, that locally looks like a symlink
+            # pointing to a directory that is not in the package, then change
+            # it to a real directory in the repacked package. This assummes
+            # that in this case, the symlink was a local change (e.g., /usr
+            # is a symlink).
+            #
+            # However, if the directory in question contains no files in the
+            # filelist for this package, don't do that, just preserve the
+            # symlink in the repacked package. This handles the case where a
+            # package contains a symlink to a directory elsewhere.
+            #
+            # We rely on the order of the filelist listing parent directories
+            # first, and then their contents. There has to be a better way to
+            # do this!
+            my $f = '';
+            foreach my $dir (split(m/\/+/, $origfn)) {
+                $f .= "/$dir";
+                next if -d $build_dir . $f;
+                my $st = stat($rootdir . $f);
+                SafeMkdir "$build_dir/$f", $st->mode;
+                chown($st->uid, $st->gid, "$build_dir/$f");
+            }
+        } elsif (-p $fn) {
+            # Copy a named pipe with cp -a.
+            SafeSystem 'cp', '-a', $fn, "$build_dir/$origfn", '';
+        } else {
+            SafeSystem 'cp', '-pd', $fn, "$build_dir/$origfn", '';
+        }
+    }
 
-	return @conffiles;
+    return @conffiles;
+}
+
+# Some sanity checks.
+if ($> != 0) {
+    # Try to exec self with fakeroot if we are not running as root.
+    if (find_command('fakeroot')) {
+        exec 'fakeroot', '-u', $0, @ARGV;
+    }
+    Die 'This program should be run as root (or you could use fakeroot -u). Aborting.';
+}
+if (exists $ENV{FAKED_MODE} && $ENV{FAKED_MODE} ne 'unknown-is-real') {
+    Warn 'fakeroot run without its -u flag may corrupt some file permissions.';
 }
 
 # Parse parameters.
 $rootdir = '';
 my $ret = GetOptions(
-	'root|r=s', \$rootdir,
-	'arch|a=s', \$arch,
-	'deb-option|d=s@', \@deb_options,
-	'generate|g' , \$generate,
-	'help|?', sub { Syntax(); exit 0; },
-	'version', sub { Version(); exit 0; },
+    'root|r=s', \$rootdir,
+    'arch|a=s', \$arch,
+    'deb-option|d=s@', \@deb_options,
+    'generate|g' , \$generate,
+    'tag=s', \$tags,
+    'help|?', sub { Syntax(); exit 0; },
+    'version', sub { Version(); exit 0; },
 );
 
-if (not @ARGV or not $ret) {
-	Syntax();
-	exit 1;
+# Handle metadata tagging.
+foreach my $type (split /,/, $tags) {
+    if ($type eq 'none') {
+        $tag{$_} = 0 foreach (keys %tag);
+    } elsif ($type eq 'all') {
+        $tag{$_} = 1 foreach (keys %tag);
+    } elsif (exists $tag{$type}) {
+        $tag{$type} = 1;
+    } else {
+        Die("unknown --tag type '$type'");
+    }
 }
-$build_dir = "./dpkg-repack-$$";
 
-# Some sanity checks.
-if ($> != 0) {
-	Die 'This program should be run as root (or you could use fakeroot -u). Aborting.';
-}
-if (exists $ENV{FAKED_MODE} && $ENV{FAKED_MODE} ne 'unknown-is-real') {
-	Warn 'fakeroot run without its -u flag may corrupt some file permissions.';
+if (not @ARGV or not $ret) {
+    Syntax();
+    exit 1;
 }
 
-foreach my $packagename (@ARGV) {
-	my @control = Extract_Control($packagename);
-	if (!@control) {
-		Die "Unable to locate $packagename in the package list.";
-	}
-
-	# If the umask is set wrong, the directories will end up with the wrong
-	# perms. (Is this still needed?)
-	umask 022;
-
-	# Generate the directory tree.
-	Make_Dirs();
-	my @conffiles = Install_Files($packagename, @control);
-	Install_DEBIAN($packagename, @conffiles);
-	Install_Control($packagename, @control);
-
-	# Stop here?
-	if ($generate) {
-		Info "dpkg-repack: created $build_dir for $packagename";
-		next;
-	}
-	
-	# Let dpkg-deb do its magic.
-	SafeSystem('dpkg-deb', @deb_options, '--build', $build_dir, '.', '');
-
-	# Finish up.
-	CleanUp();
-	if ($error_flag) {
-		Error('Problems were encountered in processing.');
-		Error('The package may be broken.');
-		$error_flag = 0;
-	}
+foreach my $pkgname (@ARGV) {
+    my $inst = Extract_Status($pkgname);
+
+    # If the umask is set wrong, the directories will end up with the wrong
+    # perms. (Is this still needed?)
+    umask 022;
+
+    # Generate the directory tree.
+    my $build_dir = Make_Dirs($pkgname);
+    my @conffiles = Install_Files($build_dir, $inst);
+    Install_DEBIAN($build_dir, $inst, @conffiles);
+    Install_Control($build_dir, $inst);
+
+    # Do we need to create the binary packages?
+    if ($generate) {
+        Info("created $build_dir for $pkgname");
+    } else {
+        # Let dpkg-deb do its magic.
+        SafeSystem('dpkg-deb', @deb_options, '--build', $build_dir, '.', '');
+    }
+
+    if ($error_flag) {
+        Error('Problems were encountered in processing.');
+        Error('The package may be broken.');
+        $error_flag = 0;
+    }
 }
diff -Nru dpkg-repack-1.41/dpkg-repack.1 dpkg-repack-1.43/dpkg-repack.1
--- dpkg-repack-1.41/dpkg-repack.1	2015-04-11 15:26:31.000000000 +0000
+++ dpkg-repack-1.43/dpkg-repack.1	2016-02-29 08:01:19.000000000 +0000
@@ -1,4 +1,4 @@
-.TH dpkg\-repack 1 "2015-04-11" 1.41 "dpkg suite"
+.TH dpkg\-repack 1 "2016-02-29" 1.43 "dpkg suite"
 .SH NAME
 dpkg\-repack \- put an unpacked .deb file back together
 .
@@ -10,7 +10,7 @@
 creates a .deb file out of a Debian package
 that has already been installed on your system.
 
-If any changes have been made to the package while it was unpacked (ie,
+If any changes have been made to the package while it was unpacked (e.g.
 conffiles files in /etc modified), the new package will inherit the
 changes. (There are exceptions to this, including changes to configuration
 files that are not conffiles, including those managed by ucf.)
@@ -56,6 +56,29 @@
 \fBfakroot \-u\fP), where \fIdir\fP is the generated directory.
 .
 .TP
+.BR \-\-tag "=\fIthing\fP[,...]"
+Specify a comma-separated list of things to tag in the package as having
+been repackaged.
+The current list of \fIthing\fPs to tag is:
+.RS
+.TP
+.B none
+Tag nothing.
+This can be specified first to be augmented by more specific \fIthing\fPs.
+.TP
+.B description
+Append a timestamped "Repackaged by dpkg-repack" tagline to the package's
+control file \fBDescription\fP field.
+This tag is enabled by default.
+.TP
+.B version
+Append a "+repack" tag to the package version.
+.TP
+.B all
+Tag everything.
+.RE
+.
+.TP
 .I package-name
 The name of the package to attempt to repack. Multiple packages can be listed.
 .
diff -Nru dpkg-repack-1.41/.mailmap dpkg-repack-1.43/.mailmap
--- dpkg-repack-1.41/.mailmap	2014-11-26 04:45:43.000000000 +0000
+++ dpkg-repack-1.43/.mailmap	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-# Use full name and real mail addresses
-Joey Hess <joey@kitenet.net> <joey@a4a2c43b-8ac3-0310-8836-e0e880c912e2>
-# Unify sub-domains.
-<joey@kitenet.net> <joey@gnu.kitenet.net>
-<joey@kitenet.net> <joey@kodama.kitenet.net>
diff -Nru dpkg-repack-1.41/README dpkg-repack-1.43/README
--- dpkg-repack-1.41/README	2014-11-26 04:45:17.000000000 +0000
+++ dpkg-repack-1.43/README	2016-02-28 22:27:56.000000000 +0000
@@ -26,8 +26,13 @@
 Source Repository
 -----------------
 
+The master repository can be browsed at:
+
   <https://anonscm.debian.org/cgit/dpkg/dpkg-repack.git>
-  <git://anonscm.debian.org/dpkg/dpkg-repack.git>
+
+and cloned from:
+
+  <https://anonscm.debian.org/git/dpkg/dpkg-repack.git>
 
 
 Mailing List
diff -Nru dpkg-repack-1.41/t/syntax.t dpkg-repack-1.43/t/syntax.t
--- dpkg-repack-1.41/t/syntax.t	1970-01-01 00:00:00.000000000 +0000
+++ dpkg-repack-1.43/t/syntax.t	2016-02-29 08:02:46.000000000 +0000
@@ -0,0 +1,22 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+
+eval q{
+    use Test::Strict;
+    $Test::Strict::TEST_WARNINGS = 1;
+};
+plan skip_all => 'Test::Strict required for testing syntax' if $@;
+
+my @files = qw(dpkg-repack);
+
+plan tests => scalar @files * 3;
+
+for my $file (@files) {
+    syntax_ok($file);
+    strict_ok($file);
+    warnings_ok($file);
+}